--- swift/utils/build-script-impl.orig	2017-03-28 05:42:53.000000000 +0000
+++ swift/utils/build-script-impl	2017-04-23 23:59:13.869062000 +0000
@@ -1948,8 +1948,11 @@ for host in "${ALL_HOSTS[@]}"; do
                 # gold linker support.
                 cmake_options=(
                     "${cmake_options[@]}"
-                    -DCMAKE_EXE_LINKER_FLAGS:STRING="-fuse-ld=gold"
-                    -DCMAKE_SHARED_LINKER_FLAGS:STRING="-fuse-ld=gold"
+                    -DCMAKE_EXE_LINKER_FLAGS:STRING="-L/usr/local/lib -fuse-ld=gold"
+                    -DCMAKE_SHARED_LINKER_FLAGS:STRING="-L/usr/local/lib -fuse-ld=gold"
+                    -DCMAKE_CPP_COMPILER=%%CPP_ONLY%%
+                    -DCMAKE_C_COMPILER=%%CC_ONLY%%
+                    -DCMAKE_CXX_COMPILER=%%CXX_ONLY%%
                 )
             fi
         else