[Flang][CMake] Add explicit libFortranCommon dependency for f18 etc.

rorth · rorth · commit 3119bdb5d695 · 2020-04-28T13:28:41.000+02:00
When I tried Solaris builds with `-DBUILD_SHARED_LIBS=ON`, some commands failed to link: [ 94%] Linking CXX executable ../../../../bin/f18 Undefined first referenced symbol in file Fortran::common::IntrinsicTypeDefaultKinds::set_sizeIntegerKind(int) CMakeFiles/f18.dir/f18.cpp.o (symbol belongs to implicit dependency /var/llvm/local-amd64-release-shared-gcc8-make/lib/libFortranCommon.so.11git) Fortran::common::IntrinsicTypeDefaultKinds::set_subscriptIntegerKind(int) CMakeFiles/f18.dir/f18.cpp.o (symbol belongs to implicit dependency /var/llvm/local-amd64-release-shared-gcc8-make/lib/libFortranCommon.so.11git) Fortran::common::EnumIndexToString[abi:cxx11](int, char const*) CMakeFiles/f18.dir/f18.cpp.o (symbol belongs to implicit dependency /var/llvm/local-amd64-release-shared-gcc8-make/lib/libFortranCommon.so.11git) Fortran::common::IntrinsicTypeDefaultKinds::set_defaultIntegerKind(int) CMakeFiles/f18.dir/f18.cpp.o (symbol belongs to implicit dependency /var/llvm/local-amd64-release-shared-gcc8-make/lib/libFortranCommon.so.11git) Fortran::common::IntrinsicTypeDefaultKinds::IntrinsicTypeDefaultKinds() CMakeFiles/f18.dir/f18.cpp.o (symbol belongs to implicit dependency /var/llvm/local-amd64-release-shared-gcc8-make/lib/libFortranCommon.so.11git) Fortran::common::IntrinsicTypeDefaultKinds::set_defaultRealKind(int) CMakeFiles/f18.dir/f18.cpp.o (symbol belongs to implicit dependency /var/llvm/local-amd64-release-shared-gcc8-make/lib/libFortranCommon.so.11git) ld: fatal: symbol referencing errors This patch fixes this by adding explicit dependencies on `libFortranCommon` to the affected commands. Tested on `amd64-pc-solaris2.11`, `sparcv9-sun-solaris2.11`, and `x86-64-pc-linux-gnu`. Differential Revision: https://reviews.llvm.org/D78761
diff --git a/flang/tools/f18-parse-demo/CMakeLists.txt b/flang/tools/f18-parse-demo/CMakeLists.txt
@@ -5,5 +5,6 @@ add_flang_tool(f18-parse-demo
 
 target_link_libraries(f18-parse-demo
   PRIVATE
+  FortranCommon
   FortranParser
   )
diff --git a/flang/tools/f18/CMakeLists.txt b/flang/tools/f18/CMakeLists.txt
@@ -5,6 +5,7 @@ add_flang_tool(f18
 
 target_link_libraries(f18
   PRIVATE
+  FortranCommon
   FortranParser
   FortranEvaluate
   FortranSemantics
diff --git a/flang/unittests/Evaluate/CMakeLists.txt b/flang/unittests/Evaluate/CMakeLists.txt
@@ -41,6 +41,7 @@ add_executable(expression-test
 )
 
 target_link_libraries(expression-test
+  FortranCommon
   FortranEvaluateTesting
   FortranEvaluate
   FortranSemantics
@@ -64,6 +65,7 @@ add_executable(intrinsics-test
 )
 
 target_link_libraries(intrinsics-test
+  FortranCommon
   FortranEvaluateTesting
   FortranEvaluate
   FortranDecimal
@@ -130,6 +132,7 @@ add_executable(folding-test
 )
 
 target_link_libraries(folding-test
+  FortranCommon
   FortranEvaluateTesting
   FortranEvaluate
   FortranSemantics

Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,6 @@ add_flang_tool(f18-parse-demo`
`5`	`5`
`6`	`6`	`target_link_libraries(f18-parse-demo`
`7`	`7`	`PRIVATE`
	`8`	`+ FortranCommon`
`8`	`9`	`FortranParser`
`9`	`10`	`)`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ add_executable(expression-test`
`41`	`41`	`)`
`42`	`42`
`43`	`43`	`target_link_libraries(expression-test`
	`44`	`+ FortranCommon`
`44`	`45`	`FortranEvaluateTesting`
`45`	`46`	`FortranEvaluate`
`46`	`47`	`FortranSemantics`
`@@ -64,6 +65,7 @@ add_executable(intrinsics-test`
`64`	`65`	`)`
`65`	`66`
`66`	`67`	`target_link_libraries(intrinsics-test`
	`68`	`+ FortranCommon`
`67`	`69`	`FortranEvaluateTesting`
`68`	`70`	`FortranEvaluate`
`69`	`71`	`FortranDecimal`
`@@ -130,6 +132,7 @@ add_executable(folding-test`
`130`	`132`	`)`
`131`	`133`
`132`	`134`	`target_link_libraries(folding-test`
	`135`	`+ FortranCommon`
`133`	`136`	`FortranEvaluateTesting`
`134`	`137`	`FortranEvaluate`
`135`	`138`	`FortranSemantics`