Skip to content

Commit 17faf35

Browse files
committed
build fix
1 parent 3097207 commit 17faf35

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

clang/include/clang/Driver/Options.td

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7103,6 +7103,8 @@ def module_dir : JoinedOrSeparate<["-"], "module-dir">, MetaVarName<"<dir>">,
71037103
It is also added to the list of directories to be searched by an USE statement.
71047104
The default is the current directory.}]>;
71057105

7106+
def module_dir_EQ : Joined<["-"], "module-dir=">, Alias<module_dir>;
7107+
71067108
def ffixed_form : Flag<["-"], "ffixed-form">, Group<f_Group>,
71077109
HelpText<"Process source files in fixed form">;
71087110
def ffree_form : Flag<["-"], "ffree-form">, Group<f_Group>,
@@ -7137,11 +7139,10 @@ def fintrinsic_modules_path : Separate<["-"], "fintrinsic-modules-path">, Group<
71377139
HelpText<"Specify where to find the compiled intrinsic modules">,
71387140
DocBrief<[{This option specifies the location of pre-compiled intrinsic modules,
71397141
if they are not in the default location expected by the compiler.}]>;
7140-
def fintrinsic_modules_path_EQ : Joined<["-"], "fintrinsic-modules-path=">, Group<f_Group>, MetaVarName<"<dir>">, Visibility<[FlangOption, FC1Option]>, // TODO: MK: Not yet implemented
7141-
HelpText<"Specify where to find the compiled intrinsic modules">,
7142-
DocBrief<[{This option specifies the location of pre-compiled intrinsic modules,
7143-
if they are not in the default location expected by the compiler.}]>;
7144-
7142+
def fintrinsic_modules_path_EQ : Joined<["-"], "fintrinsic-modules-path=">, Group<f_Group>, Visibility<[FlangOption, FC1Option]>,
7143+
Alias<fintrinsic_modules_path>;
7144+
7145+
71457146
defm backslash : OptInFC1FFlag<"backslash", "Specify that backslash in string introduces an escape character">;
71467147
defm xor_operator : OptInFC1FFlag<"xor-operator", "Enable .XOR. as a synonym of .NEQV.">;
71477148
defm logical_abbreviations : OptInFC1FFlag<"logical-abbreviations", "Enable logical abbreviations">;

flang-rt/lib/runtime/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ if (NOT WIN32)
328328
LINK_LIBRARIES flang_rt.intrinsics
329329
COMPILE_OPTIONS
330330
"$<$<COMPILE_LANGUAGE:Fortran>:SHELL:-fintrinsic-modules-path>"
331-
"$<$<COMPILE_LANGUAGE:Fortran>:${FLANG_RT_OUTPUT_RESOURCE_MOD_DIR}>"
331+
"$<$<COMPILE_LANGUAGE:Fortran>:${RUNTIMES_OUTPUT_RESOURCE_MOD_DIR}>"
332332
TARGET_PROPERTIES
333333
# Two spellings for the same thing: https://cmake.org/cmake/help/latest/prop_tgt/Fortran_BUILDING_INSTRINSIC_MODULES.html
334334
# Supported only since CMake 3.22

0 commit comments

Comments
 (0)