Extend -Bprefix functionality and make it closer to gcc. If the "prefix"

is not a directory, Driver::GetProgramPath() routine does not try to append
the program name as a "path component" to it. It just joins the "prefix" with
the program name and checks the resulting path existence.

The patch reviewed by Rafael Espindola.

llvm-svn: 167114

5 files changed, 22 insertions, 0 deletions

diff --git a/clang/test/Driver/B-opt.c b/clang/test/Driver/B-opt.c
new file mode 100644
index 00000000000..a0b9a11162d
--- /dev/null
+++ b/clang/test/Driver/B-opt.c
@@ -0,0 +1,22 @@
+// Check -B driver option.
+//
+// RUN: %clang %s -### -o %t.o -target i386-unknown-linux \
+// RUN:     -B %S/Inputs/B_opt_tree/dir1 2>&1 \
+// RUN:   | FileCheck --check-prefix=CHECK-B-OPT-TRIPLE %s
+// CHECK-B-OPT-TRIPLE: "{{.*}}/Inputs/B_opt_tree/dir1/i386-unknown-linux-ld"
+//
+// RUN: %clang %s -### -o %t.o -target i386-unknown-linux \
+// RUN:     -B %S/Inputs/B_opt_tree/dir2 2>&1 \
+// RUN:   | FileCheck --check-prefix=CHECK-B-OPT-DIR %s
+// CHECK-B-OPT-DIR: "{{.*}}/Inputs/B_opt_tree/dir2/ld"
+//
+// RUN: %clang %s -### -o %t.o -target i386-unknown-linux \
+// RUN:     -B %S/Inputs/B_opt_tree/dir3/prefix- 2>&1 \
+// RUN:   | FileCheck --check-prefix=CHECK-B-OPT-PREFIX %s
+// CHECK-B-OPT-PREFIX: "{{.*}}/Inputs/B_opt_tree/dir3/prefix-ld"
+//
+// RUN: %clang %s -### -o %t.o -target i386-unknown-linux \
+// RUN:     -B %S/Inputs/B_opt_tree/dir3/prefix- \
+// RUN:     -B %S/Inputs/B_opt_tree/dir2 2>&1 \
+// RUN:   | FileCheck --check-prefix=CHECK-B-OPT-MULT %s
+// CHECK-B-OPT-MULT: "{{.*}}/Inputs/B_opt_tree/dir3/prefix-ld"
diff --git a/clang/test/Driver/Inputs/B_opt_tree/dir1/i386-unknown-linux-ld b/clang/test/Driver/Inputs/B_opt_tree/dir1/i386-unknown-linux-ld
new file mode 100755
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/clang/test/Driver/Inputs/B_opt_tree/dir1/i386-unknown-linux-ld
diff --git a/clang/test/Driver/Inputs/B_opt_tree/dir1/ld b/clang/test/Driver/Inputs/B_opt_tree/dir1/ld
new file mode 100755
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/clang/test/Driver/Inputs/B_opt_tree/dir1/ld
diff --git a/clang/test/Driver/Inputs/B_opt_tree/dir2/ld b/clang/test/Driver/Inputs/B_opt_tree/dir2/ld
new file mode 100755
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/clang/test/Driver/Inputs/B_opt_tree/dir2/ld
diff --git a/clang/test/Driver/Inputs/B_opt_tree/dir3/prefix-ld b/clang/test/Driver/Inputs/B_opt_tree/dir3/prefix-ld
new file mode 100755
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/clang/test/Driver/Inputs/B_opt_tree/dir3/prefix-ld