llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang Author: Leandro Lupori (luporl) <details> <summary>Changes</summary> If DEFAULT_SYSROOT is not specfied when building flang, then the -isysroot flag is needed to link binaries against system libraries on Darwin. It's also needed when linking against a non-default sysroot. --- Full diff: https://github.com/llvm/llvm-project/pull/77365.diff 4 Files Affected: - (modified) clang/include/clang/Driver/Options.td (+1-1) - (modified) flang/test/Driver/driver-help-hidden.f90 (+1) - (modified) flang/test/Driver/driver-help.f90 (+1) - (added) flang/test/Driver/isysroot.f90 (+12) ``````````diff diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index 6aff37f1336871..f42e9c7eb92a67 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -4265,7 +4265,7 @@ def iquote : JoinedOrSeparate<["-"], "iquote">, Group<clang_i_Group>, Visibility<[ClangOption, CC1Option]>, HelpText<"Add directory to QUOTE include search path">, MetaVarName<"<directory>">; def isysroot : JoinedOrSeparate<["-"], "isysroot">, Group<clang_i_Group>, - Visibility<[ClangOption, CC1Option]>, + Visibility<[ClangOption, CC1Option, FlangOption]>, HelpText<"Set the system root directory (usually /)">, MetaVarName<"<dir>">, MarshallingInfoString<HeaderSearchOpts<"Sysroot">, [{"/"}]>; def isystem : JoinedOrSeparate<["-"], "isystem">, Group<clang_i_Group>, diff --git a/flang/test/Driver/driver-help-hidden.f90 b/flang/test/Driver/driver-help-hidden.f90 index 9a11a7a571ffcc..a4444ca043d0ea 100644 --- a/flang/test/Driver/driver-help-hidden.f90 +++ b/flang/test/Driver/driver-help-hidden.f90 @@ -111,6 +111,7 @@ ! CHECK-NEXT: -g Generate source-level debug information ! CHECK-NEXT: --help-hidden Display help for hidden options ! CHECK-NEXT: -help Display available options +! CHECK-NEXT: -isysroot <dir> Set the system root directory (usually /) ! CHECK-NEXT: -I <dir> Add directory to the end of the list of include search paths ! CHECK-NEXT: -L <dir> Add directory to library search path ! CHECK-NEXT: -march=<value> For a list of available architectures for the target use '-mcpu=help' diff --git a/flang/test/Driver/driver-help.f90 b/flang/test/Driver/driver-help.f90 index e0e74dc56f331e..07189264104592 100644 --- a/flang/test/Driver/driver-help.f90 +++ b/flang/test/Driver/driver-help.f90 @@ -97,6 +97,7 @@ ! HELP-NEXT: -g Generate source-level debug information ! HELP-NEXT: --help-hidden Display help for hidden options ! HELP-NEXT: -help Display available options +! HELP-NEXT: -isysroot <dir> Set the system root directory (usually /) ! HELP-NEXT: -I <dir> Add directory to the end of the list of include search paths ! HELP-NEXT: -L <dir> Add directory to library search path ! HELP-NEXT: -march=<value> For a list of available architectures for the target use '-mcpu=help' diff --git a/flang/test/Driver/isysroot.f90 b/flang/test/Driver/isysroot.f90 new file mode 100644 index 00000000000000..70d2fc0345ce50 --- /dev/null +++ b/flang/test/Driver/isysroot.f90 @@ -0,0 +1,12 @@ +! Verify that the -isysroot flag is known to the frontend and, on Darwin, +! is passed on to the linker. + +! RUN: %flang -### --target=aarch64-apple-darwin -isysroot /path/to/sysroot \ +! RUN: %s 2>&1 | FileCheck %s --check-prefix=CHECK-DARWIN +! RUN: %flang -### --target=aarch64-linux-gnu -isysroot /path/to/sysroot \ +! RUN: %s 2>&1 | FileCheck %s --check-prefix=CHECK-LINUX + +! CHECK-DARWIN: "{{.*}}/ld" {{.*}}"-syslibroot" "/path/to/sysroot" +! Unused on Linux. +! CHECK-LINUX: warning: argument unused during compilation: '-isysroot /path/to/sysroot' +! CHECK-LINUX-NOT: /path/to/sysroot `````````` </details> https://github.com/llvm/llvm-project/pull/77365 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
