[PATCH] D10697: Use GetLinkerPath utility function to find linker for NaCl toolchain

[Derek Schuff via llvm-commits]

dschuff updated this revision to Diff 33021.
dschuff added a comment.
Herald added subscribers: dschuff, jfb.

- broken test. uses system ld.gold


http://reviews.llvm.org/D10697

Files:
  lib/Driver/ToolChains.cpp
  test/Driver/Inputs/basic_nacl_tree/bin/ld
  test/Driver/Inputs/basic_nacl_tree/bin/ld.gold
  test/Driver/fuse-ld.c

Index: test/Driver/fuse-ld.c
===================================================================
--- test/Driver/fuse-ld.c
+++ test/Driver/fuse-ld.c
@@ -61,3 +61,9 @@
 // RUN:     -gcc-toolchain %S/Inputs/basic_android_tree 2>&1 \
 // RUN:   | FileCheck %s -check-prefix=CHECK-ANDROID-ARM-GOLD-TC
 // CHECK-ANDROID-ARM-GOLD-TC: Inputs/basic_android_tree/lib/gcc/arm-linux-androideabi/4.4.3/../../../../arm-linux-androideabi/bin{{/|\\+}}ld.gold
+
+// RUN: %clang %s -### -fuse-ld=gold \
+// RUN:     -target i686-unknown-nacl \
+// RUN:     -B%S/Inputs/basic_nacl_tree/bin 2>&1 \
+// RUN:   | FileCheck %s -check-prefix=CHECK-NACL-GOLD-TC
+// CHECK-NACL-GOLD-TC: ld.gold
Index: lib/Driver/ToolChains.cpp
===================================================================
--- lib/Driver/ToolChains.cpp
+++ lib/Driver/ToolChains.cpp
@@ -2359,7 +2359,7 @@
   }
 
   // Use provided linker, not system linker
-  Linker = GetProgramPath("ld");
+  Linker = GetLinkerPath();
   NaClArmMacrosPath = GetFilePath("nacl-arm-macros.s");
 }
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D10697.33021.patch
Type: text/x-patch
Size: 1030 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150824/49ee7ea1/attachment.bin>