diff options
| author | James Y Knight <jyknight@google.com> | 2019-05-22 20:39:51 +0000 |
|---|---|---|
| committer | James Y Knight <jyknight@google.com> | 2019-05-22 20:39:51 +0000 |
| commit | b2ece169ed609b9111c290254d831101d21cbf8f (patch) | |
| tree | 823071454efcb255f7f87d11641e98717c4d45fa /clang/test/Driver/darwin-header-search-system.cpp | |
| parent | 275a55cb5a622491269bf89ba717d73766acaac6 (diff) | |
| download | bcm5719-llvm-b2ece169ed609b9111c290254d831101d21cbf8f.tar.gz bcm5719-llvm-b2ece169ed609b9111c290254d831101d21cbf8f.zip | |
Add back --sysroot support for darwin header search.
Before e97b5f5cf37e ([clang][Darwin] Refactor header search path logic
into the driver), both --sysroot and -isysroot worked to specify where
to look for system and C++ headers on Darwin. However, that change
caused clang to start ignoring --sysroot.
This fixes the regression, and adds tests.
(I also note that on all other platforms, clang seems to almost
completely ignore -isysroot, but that's another issue...)
Differential Revision: https://reviews.llvm.org/D62268
llvm-svn: 361429
Diffstat (limited to 'clang/test/Driver/darwin-header-search-system.cpp')
| -rw-r--r-- | clang/test/Driver/darwin-header-search-system.cpp | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/clang/test/Driver/darwin-header-search-system.cpp b/clang/test/Driver/darwin-header-search-system.cpp index 3d16c7d2d2f..fa2ad0ec62b 100644 --- a/clang/test/Driver/darwin-header-search-system.cpp +++ b/clang/test/Driver/darwin-header-search-system.cpp @@ -3,7 +3,8 @@ // General tests that the system header search paths detected by the driver // and passed to CC1 are correct on Darwin platforms. -// Check system headers (everything below <sysroot> and <resource-dir>) +// Check system headers (everything below <sysroot> and <resource-dir>). Ensure +// that both sysroot and isysroot are checked, and that isysroot has precedence. // // RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \ // RUN: -target x86_64-apple-darwin \ @@ -13,6 +14,26 @@ // RUN: | FileCheck -DSYSROOT=%S/Inputs/basic_darwin_sdk_usr_and_usr_local \ // RUN: -DRESOURCE=%S/Inputs/resource_dir \ // RUN: --check-prefix=CHECK-SYSTEM %s +// +// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \ +// RUN: -target x86_64-apple-darwin \ +// RUN: -ccc-install-dir %S/Inputs/basic_darwin_toolchain_no_libcxx/usr/bin \ +// RUN: -resource-dir=%S/Inputs/resource_dir \ +// RUN: --sysroot %S/Inputs/basic_darwin_sdk_usr_and_usr_local \ +// RUN: | FileCheck -DSYSROOT=%S/Inputs/basic_darwin_sdk_usr_and_usr_local \ +// RUN: -DRESOURCE=%S/Inputs/resource_dir \ +// RUN: --check-prefix=CHECK-SYSTEM %s +// +// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \ +// RUN: -target x86_64-apple-darwin \ +// RUN: -ccc-install-dir %S/Inputs/basic_darwin_toolchain_no_libcxx/usr/bin \ +// RUN: -resource-dir=%S/Inputs/resource_dir \ +// RUN: -isysroot %S/Inputs/basic_darwin_sdk_usr_and_usr_local \ +// RUN: --sysroot / \ +// RUN: | FileCheck -DSYSROOT=%S/Inputs/basic_darwin_sdk_usr_and_usr_local \ +// RUN: -DRESOURCE=%S/Inputs/resource_dir \ +// RUN: --check-prefix=CHECK-SYSTEM %s +// // CHECK-SYSTEM: "{{[^"]*}}clang{{[^"]*}}" "-cc1" // CHECK-SYSTEM: "-internal-isystem" "[[SYSROOT]]/usr/local/include" // CHECK-SYSTEM: "-internal-isystem" "[[RESOURCE]]/include" |
