[flang] Fix -intrinsic-module-directory in flang script

[tskeith]

Summary

The flang wrapper script that was created as bin/flang in an in-tree
build did not have a correct -intrinsic-module-directory option.
It was correct for out-of-tree builds and for both kinds of installs.

The fix is to pick the correct directory based on what exists.

The script is no longer configured by cmake (just copied) so that
mechanism can be deleted from the cmake file.

[PeteSteinfeld]

I was able to invoke the "runtest" on both in-tree and out-of-tree builds. What command were you using to invoke "runtest" that caused the problem?

I invoked it by "cd"ing to the install directory for an in-tree build. I then invoked a script that starts as follows:

#!/bin/bash
PGI="-pgi ."
xargs -L 1 -P 40 -I CMD bash -c CMD <<EOF
# PLATFORM f18 fcvs | qsub -l nodes=1:linux:gcc72p
/proj/ta/bin/runtest -compiler llvm -env F18_FC=nvfortran NO_STOP_MESSAGE=1 -suite fcvs
# PLATFORM f18 nag f95 | qsub -l nodes=1:linux:gcc72p
/proj/ta/bin/runtest -compiler llvm -env F18_FC=nvfortran NO_STOP_MESSAGE=1 -suite nag_f95_arrays
/proj/ta/bin/runtest -compiler llvm -env F18_FC=nvfortran NO_STOP_MESSAGE=1 -suite nag_f95_handbook

[tskeith]

You need a test that depends on intrinsic modules:

$ cat t.f90
use iso_c_binding
end

$ build/Release-clang-9.0.0/bin/flang -c t.f90
t.f90:1:5: error: Error reading module file for module 'iso_c_binding'
  use iso_c_binding
      ^^^^^^^^^^^^^

[sscalpone]

Nice simplification!

[PeteSteinfeld]

All looks good. I tested the resulting compiler on both in-tree and out-of-tree builds and as able to run "runtest" for all configurations without a problem.

flang/tools/f18/CMakeLists.txt

foreach(filename ${MODULES})
   install(FILES ${include}/${filename}.mod DESTINATION include/flang)
   install(FILES ${include}/${filename}.f18.mod DESTINATION include/flang)
 endforeach()
 
 add_custom_target(module_files ALL DEPENDS ${MODULE_FILES})
 
 install(TARGETS f18 DESTINATION bin)
 
-set(FLANG_INTRINSIC_MODULES_DIR ${FLANG_BINARY_DIR}/include/flang)
-
 # This flang shell script will only work in a POSIX shell.
 if (NOT WIN32)
-  if (FLANG_STANDALONE_BUILD)
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/flang.sh.in ${CMAKE_BINARY_DIR}/tools/flang/bin/flang @ONLY)
-    file(COPY ${CMAKE_BINARY_DIR}/tools/flang/bin/flang DESTINATION ${CMAKE_BINARY_DIR}/bin FILE_PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE)
-  else()
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/flang.sh.in
-      ${CMAKE_CURRENT_BINARY_DIR}/tools/flang/bin/flang @ONLY)
-    add_custom_command(TARGET f18
-        POST_BUILD
-          COMMAND ${CMAKE_COMMAND} -E copy
-          ${CMAKE_CURRENT_BINARY_DIR}/tools/flang/bin/flang
-          ${LLVM_RUNTIME_OUTPUT_INTDIR}/flang
-            COMMAND chmod +x ${LLVM_RUNTIME_OUTPUT_INTDIR}/flang)
-  endif()
+  file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/flang
+    DESTINATION ${CMAKE_BINARY_DIR}/bin
+    FILE_PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE)
+  install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang DESTINATION bin)
 endif()
 
-# The flang script to be installed needs a different path to the headers.
-set(FLANG_INTRINSIC_MODULES_DIR ${CMAKE_INSTALL_PREFIX}/include/flang)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/flang.sh.in ${FLANG_BINARY_DIR}/bin/flang-install.sh @ONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/f18_version.h.in ${CMAKE_CURRENT_BINARY_DIR}/f18_version.h @ONLY)
-
-install(PROGRAMS ${FLANG_BINARY_DIR}/bin/flang-install.sh DESTINATION bin RENAME flang)

flang/tools/f18/flang

+#!/bin/bash
+#===-- tools/f18/flang.sh -----------------------------------------*- sh -*-===#
+#
+# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+# See https://llvm.org/LICENSE.txt for license information.
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+#
+#===------------------------------------------------------------------------===#
+
+wd=$(cd $(dirname "$0")/.. && pwd)
+module_dir=$wd/include/flang
+if [[ ! -d $module_dir ]]; then
+  module_dir=$wd/tools/flang/include/flang
+fi
+$wd/bin/f18 -module-suffix .f18.mod -intrinsic-module-directory $module_dir "$@"

flang/tools/f18/flang.sh.in

-#!/bin/bash
-#===-- tools/f18/flang.sh -----------------------------------------*- sh -*-===#
-#
-# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-# See https://llvm.org/LICENSE.txt for license information.
-# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-#
-#===------------------------------------------------------------------------===#
-
-function abspath() {
-  pushd . > /dev/null;
-  if [ -d "$1" ]; then
-    cd "$1";
-    dirs -l +0;
-  else
-    cd "`dirname \"$1\"`";
-    cur_dir=`dirs -l +0`;
-    if [ "$cur_dir" == "/" ]; then
-      echo "$cur_dir`basename \"$1\"`";
-    else
-      echo "$cur_dir/`basename \"$1\"`";
-    fi;
-  fi;
-  popd > /dev/null;
-}
-
-wd=`abspath $(dirname "$0")/..`
-
-${wd}/bin/f18 -module-suffix .f18.mod -intrinsic-module-directory ${wd}/include/flang $*