[flang-commits] [flang] bcf95cb - [flang] Create intrinsics modules directory (contd.)

[Tim Keith via flang-commits]

Author: Tim Keith
Date: 2021-03-15T15:38:05-07:00
New Revision: bcf95cbb2ce428d7b6d41d29a198889dc02617a7

URL: https://github.com/llvm/llvm-project/commit/bcf95cbb2ce428d7b6d41d29a198889dc02617a7
DIFF: https://github.com/llvm/llvm-project/commit/bcf95cbb2ce428d7b6d41d29a198889dc02617a7.diff

LOG: [flang] Create intrinsics modules directory (contd.)

Use -module-dir rather than WORKING_DIRECTORY because we are potentially
creating the working directory in this custom command.

Added: 
    

Modified: 
    flang/tools/f18/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/flang/tools/f18/CMakeLists.txt b/flang/tools/f18/CMakeLists.txt
index 25f633e32546..fc84bbf09c59 100644
--- a/flang/tools/f18/CMakeLists.txt
+++ b/flang/tools/f18/CMakeLists.txt
@@ -47,8 +47,8 @@ foreach(filename ${MODULES})
   endif()
   add_custom_command(OUTPUT ${base}.mod
     COMMAND ${CMAKE_COMMAND} -E make_directory ${FLANG_INTRINSIC_MODULES_DIR}
-    COMMAND f18 -fsyntax-only ${FLANG_SOURCE_DIR}/module/${filename}.f90
-    WORKING_DIRECTORY ${FLANG_INTRINSIC_MODULES_DIR}
+    COMMAND f18 -fsyntax-only -module-dir ${FLANG_INTRINSIC_MODULES_DIR}
+      ${FLANG_SOURCE_DIR}/module/${filename}.f90
     DEPENDS f18 ${FLANG_SOURCE_DIR}/module/${filename}.f90 ${depends}
   )
   add_custom_command(OUTPUT ${base}.f18.mod