Avoid LLVM_LIBRARY_OUTPUT_INTDIR

Author: Meinersbur

flang-rt/CMakeLists.txt

@@ -73,13 +73,22 @@ if (LLVM_LIBRARY_OUTPUT_INTDIR AND LLVM_RUNTIME_OUTPUT_INTDIR AND PACKAGE_VERSIO
 endif()
 
 if (LLVM_TREE_AVAILABLE)
+  # In a bootstrap build emit the libraries into a default search path in the
+  # build directory of the just-built compiler. This allows using the
+  # just-built compiler without specifying paths to runtime libraries.
+  #
   # Despite Clang in the name, get_clang_resource_dir does not depend on Clang
   # being added to the build. Flang uses the same resource dir as clang.
   include(GetClangResourceDir)
   get_clang_resource_dir(FLANG_RT_BUILD_LIB_DIR PREFIX "${LLVM_LIBRARY_OUTPUT_INTDIR}/.." SUBDIR "lib${LLVM_LIBDIR_SUFFIX}")
   get_clang_resource_dir(FLANG_RT_INSTALL_LIB_DIR SUBDIR "lib${LLVM_LIBDIR_SUFFIX}") # No prefix, CMake's install command finds the install prefix itself
 else ()
-  set(FLANG_RT_BUILD_LIB_DIR "${LLVM_LIBRARY_OUTPUT_INTDIR}")
+  # In a runtimes build never write into LLVM's build dir. It might be reused
+  # for mutliple Flang-RT builds (e.g. Debug/Release). Instead create our own
+  # library directory.
+  #
+  # TODO: Support multi-config generators
+  set(FLANG_RT_BUILD_LIB_DIR "${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}")
   set(FLANG_RT_INSTALL_LIB_DIR "lib${LLVM_LIBDIR_SUFFIX}")
 endif ()
 

flang-rt/test/Driver/ctofortran.f90

@@ -1,7 +1,7 @@
 ! UNSUPPORTED: system-windows
 ! RUN: split-file %s %t
 ! RUN: chmod +x %t/runtest.sh
-! RUN: %t/runtest.sh %t %t/ffile.f90 %t/cfile.c %flang | FileCheck %s
+! RUN: %t/runtest.sh %t %t/ffile.f90 %t/cfile.c %flang %libdir | FileCheck %s
 
 !--- ffile.f90
 program fmain
@@ -71,16 +71,16 @@ end subroutine foo
 FFILE=$2
 CFILE=$3
 FLANG=$4
-shift 4
+LIBDIR=$5
+shift 5
 FLAGS="$*"
 BINDIR=`dirname $FLANG`
-LIBDIR=$BINDIR/../lib
 CCOMP=$BINDIR/clang
 if [ -x $CCOMP ]
 then
   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIBDIR
   $CCOMP $FLAGS -c $CFILE -o $TMPDIR/cfile.o
-  $FLANG $FLAGS $FFILE $TMPDIR/cfile.o -o $TMPDIR/ctofortran
+  $FLANG $FLAGS $FFILE $TMPDIR/cfile.o -o $TMPDIR/ctofortran -L"${LIBDIR}"
   $TMPDIR/ctofortran # should print "PASS"
 else
   # No clang compiler, just pass by default

flang-rt/test/Driver/exec.f90

@@ -1,7 +1,7 @@
 ! Verify that flang can correctly build executables.
 
-! RUN: %flang %s -o %t
-! RUN: env LD_LIBRARY_PATH="$LD_LIBRARY_PATH:%llvmshlibdir" %t | FileCheck %s
+! RUN: %flang -L"%libdir" %s -o %t
+! RUN: env LD_LIBRARY_PATH="$LD_LIBRARY_PATH:%libdir" %t | FileCheck %s
 ! RUN: rm -f %t
 
 ! CHECK: Hello, World!

flang-rt/test/lit.cfg.py

@@ -70,6 +70,8 @@
     )
 ]
 
+tools.append(ToolSubst("%libdir", command=config.flangrt_build_lib_dir, unresolved="fatal"))
+
 # Define some variables to help us test that the flang runtime doesn't depend on
 # the C++ runtime libraries. For this we need a C compiler.
 libruntime = os.path.join(config.flangrt_build_lib_dir, "libflang_rt.a")