Skip to content

Commit fc5821a

Browse files
committed
Address the review comments.
1 parent 83a2770 commit fc5821a

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

clang/include/clang/Driver/Options.td

+2-2
Original file line numberDiff line numberDiff line change
@@ -6881,10 +6881,10 @@ defm android_pad_segment : BooleanFFlag<"android-pad-segment">, Group<f_Group>;
68816881
} // let Flags = [TargetSpecific]
68826882

68836883
def shared_libflangrt : Flag<["-"], "shared-libflangrt">,
6884-
HelpText<"Dynamically link the shared flang-rt">, Group<Link_Group>,
6884+
HelpText<"Link the flang-rt shared library">, Group<Link_Group>,
68856885
Visibility<[FlangOption]>, Flags<[NoArgumentUnused]>;
68866886
def static_libflangrt : Flag<["-"], "static-libflangrt">,
6887-
HelpText<"Statically link the static flang-rt">, Group<Link_Group>,
6887+
HelpText<"Link the flang-rt static library">, Group<Link_Group>,
68886888
Visibility<[FlangOption]>, Flags<[NoArgumentUnused]>;
68896889

68906890
//===----------------------------------------------------------------------===//

clang/lib/Driver/ToolChain.cpp

+6-4
Original file line numberDiff line numberDiff line change
@@ -744,10 +744,12 @@ std::string ToolChain::buildCompilerRTBasename(const llvm::opt::ArgList &Args,
744744
Suffix = IsITANMSVCWindows ? ".lib" : ".a";
745745
break;
746746
case ToolChain::FT_Shared:
747-
Suffix = TT.isOSWindows()
748-
? (TT.isWindowsGNUEnvironment() ? ".dll.a" : ".lib")
749-
: TT.isOSAIX() ? ".a"
750-
: ".so";
747+
if (TT.isOSWindows())
748+
Suffix = TT.isWindowsGNUEnvironment() ? ".dll.a" : ".lib";
749+
else if (TT.isOSAIX())
750+
Suffix = ".a";
751+
else
752+
Suffix = ".so";
751753
break;
752754
}
753755

0 commit comments

Comments
 (0)