diff options
| author | Derek Schuff <dschuff@google.com> | 2015-08-26 17:14:08 +0000 |
|---|---|---|
| committer | Derek Schuff <dschuff@google.com> | 2015-08-26 17:14:08 +0000 |
| commit | 9afb05024d86bcdba8e1a59d81d8c2bf6edbddf6 (patch) | |
| tree | c66a1bf6923ae01423ea9b5f8e41d259759d80c0 /clang/test/Driver/nacl-direct.c | |
| parent | 8409e88fdef77a4970b067706d24cd70a347aadd (diff) | |
| download | bcm5719-llvm-9afb05024d86bcdba8e1a59d81d8c2bf6edbddf6.tar.gz bcm5719-llvm-9afb05024d86bcdba8e1a59d81d8c2bf6edbddf6.zip | |
Change Native Client x86 usr include and link path to match SDK expectations
GNU multilib style uses x86_64-nacl/include and x86_64-nacl/usr/include
but the SDK expects i686-nacl/usr/include for its files. Change the driver
to use this.
Fixes https://code.google.com/p/nativeclient/issues/detail?id=4108
Differential Revision: http://reviews.llvm.org/D11271
llvm-svn: 246040
Diffstat (limited to 'clang/test/Driver/nacl-direct.c')
| -rw-r--r-- | clang/test/Driver/nacl-direct.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/test/Driver/nacl-direct.c b/clang/test/Driver/nacl-direct.c index 5fe85762232..f71e14f996e 100644 --- a/clang/test/Driver/nacl-direct.c +++ b/clang/test/Driver/nacl-direct.c @@ -9,7 +9,7 @@ // CHECK-I686: "-target-cpu" "pentium4" // CHECK-I686: "-resource-dir" "foo" // CHECK-I686: "-internal-isystem" "foo{{/|\\\\}}include" -// CHECK-I686: "-internal-isystem" "{{.*}}{{/|\\\\}}..{{/|\\\\}}x86_64-nacl{{/|\\\\}}usr{{/|\\\\}}include" +// CHECK-I686: "-internal-isystem" "{{.*}}{{/|\\\\}}..{{/|\\\\}}i686-nacl{{/|\\\\}}usr{{/|\\\\}}include" // CHECK-I686: "-internal-isystem" "{{.*}}{{/|\\\\}}..{{/|\\\\}}x86_64-nacl{{/|\\\\}}include" // CHECK-I686: as{{(.exe)?}}" "--32" // CHECK-I686: ld{{(.exe)?}}" @@ -17,7 +17,7 @@ // CHECK-I686: "-m" "elf_i386_nacl" // CHECK-I686: "-static" // CHECK-I686: "-L{{.*}}{{/|\\\\}}..{{/|\\\\}}x86_64-nacl{{/|\\\\}}lib32" -// CHECK-I686: "-L{{.*}}{{/|\\\\}}..{{/|\\\\}}x86_64-nacl{{/|\\\\}}usr{{/|\\\\}}lib32" +// CHECK-I686: "-L{{.*}}{{/|\\\\}}..{{/|\\\\}}i686-nacl{{/|\\\\}}usr{{/|\\\\}}lib" // CHECK-I686: "-Lfoo{{/|\\\\}}lib{{/|\\\\}}i686-nacl" // CHECK-I686-NOT: -lpthread // @@ -118,7 +118,7 @@ // CHECK-I686-CXX: "-resource-dir" "foo" // CHECK-I686-CXX: "-internal-isystem" "{{.*}}{{/|\\\\}}..{{/|\\\\}}x86_64-nacl{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}v1" // CHECK-I686-CXX: "-internal-isystem" "foo{{/|\\\\}}include" -// CHECK-I686-CXX: "-internal-isystem" "{{.*}}{{/|\\\\}}..{{/|\\\\}}x86_64-nacl{{/|\\\\}}usr{{/|\\\\}}include" +// CHECK-I686-CXX: "-internal-isystem" "{{.*}}{{/|\\\\}}..{{/|\\\\}}i686-nacl{{/|\\\\}}usr{{/|\\\\}}include" // CHECK-I686-CXX: "-internal-isystem" "{{.*}}{{/|\\\\}}..{{/|\\\\}}x86_64-nacl{{/|\\\\}}include" // CHECK-I686-CXX: "-lpthread" |
