Skip to content

Commit f599116

Browse files
MaskRayMaskRay
committed
[Driver,test] Remove --gcc-toolchain=""
This option was added so that changing CMake GCC_INSTALL_PREFIX would not cause test failures or due to cargo culting. Setting GCC_INSTALL_PREFIX leads to an error now and we should stop making our tests ugly.
1 parent 8bc2d19 commit f599116

20 files changed

+46
-277
lines changed

‎clang/test/Driver/compiler-rt-unwind.c‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44
// RUN: %clang -### %s 2>&1 \
55
// RUN: --target=x86_64-unknown-linux -rtlib=libgcc --unwindlib=platform \
6-
// RUN: --gcc-toolchain="" -resource-dir=%S/Inputs/resource_dir \
6+
// RUN: -resource-dir=%S/Inputs/resource_dir \
77
// RUN: | FileCheck --check-prefix=RTLIB-GCC %s
88
// RTLIB-GCC: "-lgcc"
99
// RTLIB-GCC-SAME: "--as-needed"
@@ -12,7 +12,7 @@
1212
//
1313
// RUN: %clangxx -### %s 2>&1 \
1414
// RUN: --target=x86_64-unknown-linux -rtlib=libgcc --unwindlib=platform \
15-
// RUN: --gcc-toolchain="" -resource-dir=%S/Inputs/resource_dir \
15+
// RUN: -resource-dir=%S/Inputs/resource_dir \
1616
// RUN: | FileCheck --check-prefix=RTLIB-GXX %s
1717
// RTLIB-GXX: "-lgcc"
1818
// RTLIB-GXX-NOT: "--as-needed"
@@ -21,11 +21,11 @@
2121
//
2222
// RUN: not %clang -### %s 2>&1 \
2323
// RUN: --target=x86_64-unknown-linux -rtlib=libgcc --unwindlib=libunwind \
24-
// RUN: --gcc-toolchain="" -resource-dir=%S/Inputs/resource_dir \
24+
// RUN: -resource-dir=%S/Inputs/resource_dir \
2525
// RUN: | FileCheck --check-prefix=RTLIB-GCC-UNWINDLIB-COMPILER-RT %s
2626
// RUN: not %clangxx -### %s 2>&1 \
2727
// RUN: --target=x86_64-unknown-linux -rtlib=libgcc --unwindlib=libunwind \
28-
// RUN: --gcc-toolchain="" -resource-dir=%S/Inputs/resource_dir \
28+
// RUN: -resource-dir=%S/Inputs/resource_dir \
2929
// RUN: | FileCheck --check-prefix=RTLIB-GCC-UNWINDLIB-COMPILER-RT %s
3030
// RTLIB-GCC-UNWINDLIB-COMPILER-RT: "-lgcc"
3131
// RTLIB-GCC-UNWINDLIB-COMPILER-RT-SAME: "--as-needed"
@@ -35,32 +35,32 @@
3535
// RUN: not %clang -### %s 2>&1 \
3636
// RUN: --target=x86_64-unknown-linux -rtlib=libgcc --unwindlib=libunwind \
3737
// RUN: -shared-libgcc \
38-
// RUN: --gcc-toolchain="" -resource-dir=%S/Inputs/resource_dir \
38+
// RUN: -resource-dir=%S/Inputs/resource_dir \
3939
// RUN: | FileCheck --check-prefix=RTLIB-GCC-SHARED-UNWINDLIB-COMPILER-RT %s
4040
// RTLIB-GCC-SHARED-UNWINDLIB-COMPILER-RT: "-l:libunwind.so"
4141
// RTLIB-GCC-SHARED-UNWINDLIB-COMPILER-RT-SAME: "-lgcc"
4242
//
4343
// RUN: not %clang -### %s 2>&1 \
4444
// RUN: --target=x86_64-unknown-linux -rtlib=libgcc --unwindlib=libunwind \
4545
// RUN: -static-libgcc \
46-
// RUN: --gcc-toolchain="" -resource-dir=%S/Inputs/resource_dir \
46+
// RUN: -resource-dir=%S/Inputs/resource_dir \
4747
// RUN: | FileCheck --check-prefix=RTLIB-GCC-STATIC-UNWINDLIB-COMPILER-RT %s
4848
// RTLIB-GCC-STATIC-UNWINDLIB-COMPILER-RT: "-lgcc"
4949
// RTLIB-GCC-STATIC-UNWINDLIB-COMPILER-RT-SAME: "-l:libunwind.a"
5050
//
5151
// RUN: %clang -### %s 2>&1 \
5252
// RUN: --target=x86_64-unknown-linux -rtlib=compiler-rt \
53-
// RUN: --gcc-toolchain="" -resource-dir=%S/Inputs/resource_dir \
53+
// RUN: -resource-dir=%S/Inputs/resource_dir \
5454
// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT %s
5555
// RTLIB-COMPILER-RT: "{{.*}}libclang_rt.builtins.a"
5656
//
5757
// RUN: %clang -### %s 2>&1 \
5858
// RUN: --target=x86_64-unknown-linux -rtlib=compiler-rt --unwindlib=libunwind \
59-
// RUN: --gcc-toolchain="" -resource-dir=%S/Inputs/resource_dir \
59+
// RUN: -resource-dir=%S/Inputs/resource_dir \
6060
// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT %s
6161
// RUN: %clangxx -### %s 2>&1 \
6262
// RUN: --target=x86_64-unknown-linux -rtlib=compiler-rt --unwindlib=libunwind \
63-
// RUN: --gcc-toolchain="" -resource-dir=%S/Inputs/resource_dir \
63+
// RUN: -resource-dir=%S/Inputs/resource_dir \
6464
// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT %s
6565
// RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT: "{{.*}}libclang_rt.builtins.a"
6666
// RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT-SAME: "--as-needed"
@@ -69,21 +69,21 @@
6969
//
7070
// RUN: %clang -### %s 2>&1 \
7171
// RUN: --target=x86_64-unknown-linux -rtlib=compiler-rt --unwindlib=libgcc \
72-
// RUN: --gcc-toolchain="" -resource-dir=%S/Inputs/resource_dir \
72+
// RUN: -resource-dir=%S/Inputs/resource_dir \
7373
// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT-UNWINDLIB-GCC %s
7474
// RTLIB-COMPILER-RT-UNWINDLIB-GCC: "{{.*}}libclang_rt.builtins.a"
7575
// RTLIB-COMPILER-RT-UNWINDLIB-GCC-SAME: "-lgcc_s"
7676
//
7777
// RUN: %clang -### %s 2>&1 \
7878
// RUN: --target=x86_64-unknown-linux -rtlib=compiler-rt --unwindlib=libgcc \
79-
// RUN: -static --gcc-toolchain="" -resource-dir=%S/Inputs/resource_dir \
79+
// RUN: -static -resource-dir=%S/Inputs/resource_dir \
8080
// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT-UNWINDLIB-GCC-STATIC %s
8181
// RTLIB-COMPILER-RT-UNWINDLIB-GCC-STATIC: "{{.*}}libclang_rt.builtins.a"
8282
// RTLIB-COMPILER-RT-UNWINDLIB-GCC-STATIC-SAME: "-lgcc_eh"
8383
//
8484
// RUN: not %clang %s 2> %t.err \
8585
// RUN: --target=x86_64-unknown-linux -rtlib=libgcc --unwindlib=libunwind \
86-
// RUN: --gcc-toolchain="" -resource-dir=%S/Inputs/resource_dir \
86+
// RUN: -resource-dir=%S/Inputs/resource_dir \
8787
// RUN: FileCheck --input-file=%t.err --check-prefix=RTLIB-GCC-UNWINDLIB-COMPILER_RT %s
8888
// RTLIB-GCC-UNWINDLIB-COMPILER_RT: "{{[.|\\\n]*}}--rtlib=libgcc requires --unwindlib=libgcc"
8989
//
@@ -97,26 +97,22 @@
9797
// RUN: %clang -### %s 2>&1 \
9898
// RUN: --target=x86_64-w64-mingw32 -rtlib=compiler-rt --unwindlib=libunwind \
9999
// RUN: -shared-libgcc \
100-
// RUN: --gcc-toolchain="" \
101100
// RUN: | FileCheck --check-prefix=MINGW-RTLIB-COMPILER-RT-SHARED-UNWINDLIB-COMPILER-RT %s
102101
// MINGW-RTLIB-COMPILER-RT-SHARED-UNWINDLIB-COMPILER-RT: "{{.*}}libclang_rt.builtins-x86_64.a"
103102
// MINGW-RTLIB-COMPILER-RT-SHARED-UNWINDLIB-COMPILER-RT-SAME: "-l:libunwind.dll.a"
104103
//
105104
// RUN: %clang -### %s 2>&1 \
106105
// RUN: --target=x86_64-w64-mingw32 -rtlib=compiler-rt --unwindlib=libunwind \
107106
// RUN: -static-libgcc \
108-
// RUN: --gcc-toolchain="" \
109107
// RUN: | FileCheck --check-prefix=MINGW-RTLIB-COMPILER-RT-STATIC-UNWINDLIB-COMPILER-RT %s
110108
// MINGW-RTLIB-COMPILER-RT-STATIC-UNWINDLIB-COMPILER-RT: "{{.*}}libclang_rt.builtins-x86_64.a"
111109
// MINGW-RTLIB-COMPILER-RT-STATIC-UNWINDLIB-COMPILER-RT-SAME: "-l:libunwind.a"
112110
//
113111
// RUN: %clang -### %s 2>&1 \
114112
// RUN: --target=x86_64-w64-mingw32 -rtlib=compiler-rt --unwindlib=libunwind \
115-
// RUN: --gcc-toolchain="" \
116113
// RUN: | FileCheck --check-prefix=MINGW-RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT %s
117114
// RUN: %clangxx -### %s 2>&1 \
118115
// RUN: --target=x86_64-w64-mingw32 -rtlib=compiler-rt --unwindlib=libunwind \
119-
// RUN: --gcc-toolchain="" \
120116
// RUN: | FileCheck --check-prefix=MINGW-RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT %s
121117
// MINGW-RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT: "{{.*}}libclang_rt.builtins-x86_64.a"
122118
// MINGW-RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT-SAME: "-lunwind"

‎clang/test/Driver/constructors.c‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,58 +7,49 @@
77
// RUN: %clang -### %s -fsyntax-only 2>&1 \
88
// RUN: --target=i386-unknown-linux \
99
// RUN: --sysroot=%S/Inputs/resource_dir \
10-
// RUN: --gcc-toolchain="" \
1110
// RUN: | FileCheck --check-prefix=CHECK-INIT-ARRAY %s
1211
//
1312
// RUN: %clang -### %s -fsyntax-only 2>&1 \
1413
// RUN: --target=i386-unknown-linux \
1514
// RUN: --sysroot=%S/Inputs/fake_install_tree \
16-
// RUN: --gcc-toolchain="" \
1715
// RUN: | FileCheck --check-prefix=CHECK-INIT-ARRAY %s
1816
//
1917
// RUN: %clang -### %s -fsyntax-only 2>&1 \
2018
// RUN: -fno-use-init-array \
2119
// RUN: --target=i386-unknown-linux \
2220
// RUN: --sysroot=%S/Inputs/fake_install_tree \
23-
// RUN: --gcc-toolchain="" \
2421
// RUN: | FileCheck --check-prefix=CHECK-NO-INIT-ARRAY %s
2522
//
2623
// RUN: %clang -### %s -fsyntax-only 2>&1 \
2724
// RUN: -fno-use-init-array -fuse-init-array \
2825
// RUN: --target=i386-unknown-linux \
2926
// RUN: --sysroot=%S/Inputs/fake_install_tree \
30-
// RUN: --gcc-toolchain="" \
3127
// RUN: | FileCheck --check-prefix=CHECK-INIT-ARRAY %s
3228
//
3329
// RUN: %clang -### %s -fsyntax-only 2>&1 \
3430
// RUN: --target=i386-unknown-linux \
3531
// RUN: --sysroot=%S/Inputs/basic_linux_tree \
36-
// RUN: --gcc-toolchain="" \
3732
// RUN: | FileCheck --check-prefix=CHECK-INIT-ARRAY %s
3833
//
3934
// RUN: %clang -### %s -fsyntax-only 2>&1 \
4035
// RUN: -fuse-init-array \
4136
// RUN: --target=i386-unknown-linux \
4237
// RUN: --sysroot=%S/Inputs/basic_linux_tree \
43-
// RUN: --gcc-toolchain="" \
4438
// RUN: | FileCheck --check-prefix=CHECK-INIT-ARRAY %s
4539
//
4640
// RUN: %clang -### %s -fsyntax-only 2>&1 \
4741
// RUN: --target=arm-unknown-linux-androideabi \
4842
// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
49-
// RUN: --gcc-toolchain="" \
5043
// RUN: | FileCheck --check-prefix=CHECK-INIT-ARRAY %s
5144
//
5245
// RUN: %clang -### %s -fsyntax-only 2>&1 \
5346
// RUN: --target=i386-unknown-linux-android \
5447
// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
55-
// RUN: --gcc-toolchain="" \
5648
// RUN: | FileCheck --check-prefix=CHECK-INIT-ARRAY %s
5749
//
5850
// RUN: %clang -### %s -fsyntax-only 2>&1 \
5951
// RUN: --target=aarch64-none-linux-gnu \
6052
// RUN: --sysroot=%S/Inputs/basic_linux_tree \
61-
// RUN: --gcc-toolchain="" \
6253
// RUN: | FileCheck --check-prefix=CHECK-INIT-ARRAY %s
6354
//
6455
// RUN: %clang -### %s -fsyntax-only 2>&1 \
@@ -68,7 +59,6 @@
6859
// RUN: %clang -### %s -fsyntax-only 2>&1 \
6960
// RUN: --target=arm64-none-linux-gnu \
7061
// RUN: --sysroot=%S/Inputs/basic_linux_tree \
71-
// RUN: --gcc-toolchain="" \
7262
// RUN: | FileCheck --check-prefix=CHECK-INIT-ARRAY %s
7363
//
7464
// RUN: %clang -### %s -fsyntax-only 2>&1 \

‎clang/test/Driver/cuda-detect.cu‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@
146146

147147
// Verify that C++ include paths are passed for both host and device frontends.
148148
// RUN: %clang -### --target=x86_64-linux-gnu %s \
149-
// RUN: --stdlib=libstdc++ --sysroot=%S/Inputs/ubuntu_14.04_multiarch_tree2 \
150-
// RUN: -nogpulib -nogpuinc --gcc-toolchain="" 2>&1 \
149+
// RUN: --stdlib=libstdc++ --sysroot=%S/Inputs/ubuntu_14.04_multiarch_tree2 \
150+
// RUN: -nogpulib -nogpuinc 2>&1 \
151151
// RUN: | FileCheck %s --check-prefix CHECK-CXXINCLUDE
152152

153153
// Verify that CUDA SDK version is propagated to the CC1 compilations.

‎clang/test/Driver/dragonfly.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
// Check x86_64-unknown-dragonfly, X86_64
77
// RUN: %clang -### %s 2>&1 --target=x86_64-unknown-dragonfly \
8-
// RUN: --gcc-toolchain="" \
98
// RUN: --sysroot=%S/Inputs/basic_dragonfly_tree \
109
// RUN: | FileCheck --check-prefix=CHECK-LD-X86_64 %s
1110
// CHECK-LD-X86_64: "-cc1" "-triple" "x86_64-unknown-dragonfly"

‎clang/test/Driver/env.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
// RUN: %clang %s -### -o %t.o --target=i386-unknown-linux \
99
// RUN: --sysroot=%S/Inputs/basic_linux_tree \
1010
// RUN: --rtlib=platform --unwindlib=platform -no-pie \
11-
// RUN: --gcc-toolchain="" 2>&1 | FileCheck --check-prefix=CHECK-LD-32 %s
11+
// RUN: 2>&1 | FileCheck --check-prefix=CHECK-LD-32 %s
1212
//
1313
// RUN: env -i LC_ALL=C PATH="" LD_LIBRARY_PATH="$LD_LIBRARY_PATH" CLANG_NO_DEFAULT_CONFIG=1 \
1414
// RUN: %clang %s -### -o %t.o --target=i386-unknown-linux \
1515
// RUN: --sysroot=%S/Inputs/basic_linux_tree \
1616
// RUN: --rtlib=platform --unwindlib=platform -no-pie \
17-
// RUN: --gcc-toolchain="" 2>&1 | FileCheck --check-prefix=CHECK-LD-32 %s
17+
// RUN: 2>&1 | FileCheck --check-prefix=CHECK-LD-32 %s
1818
//
1919
// CHECK-LD-32-NOT: warning:
2020
// CHECK-LD-32: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"

‎clang/test/Driver/haiku.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939

4040
// Check x86_64-unknown-haiku, X86_64
4141
// RUN: %clang -### %s 2>&1 --target=x86_64-unknown-haiku \
42-
// RUN: --gcc-toolchain="" \
4342
// RUN: --sysroot=%S/Inputs/haiku_x86_64_tree \
4443
// RUN: | FileCheck --check-prefix=CHECK-LD-X86_64 %s
4544
// CHECK-LD-X86_64: "-cc1" "-triple" "x86_64-unknown-haiku"
@@ -63,7 +62,6 @@
6362

6463
// Check the right flags are present with -shared
6564
// RUN: %clang -### %s -shared 2>&1 --target=x86_64-unknown-haiku \
66-
// RUN: --gcc-toolchain="" \
6765
// RUN: --sysroot=%S/Inputs/haiku_x86_64_tree \
6866
// RUN: | FileCheck --check-prefix=CHECK-X86_64-SHARED %s
6967
// CHECK-X86_64-SHARED: "-cc1" "-triple" "x86_64-unknown-haiku"

‎clang/test/Driver/hexagon-toolchain-elf.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636

3737
// RUN: %clangxx -### --target=hexagon-unknown-elf -fno-integrated-as \
3838
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/qc/bin \
39-
// RUN: --gcc-toolchain="" \
4039
// RUN: -nostdlibinc %s 2>&1 | FileCheck -check-prefix=CHECK113 %s
4140
// CHECK113: "-cc1"
4241
// CHECK113-NOT: "-internal-isystem"

0 commit comments

Comments
 (0)