diff --git a/Developer/.gitignore b/Developer/.gitignore
index 3d7421063..64147232a 100644
--- a/Developer/.gitignore
+++ b/Developer/.gitignore
@@ -30,3 +30,6 @@ Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/system/libsystem_san
 Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/system/libunwind.dylib
 Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/system/libxpc.dylib
 Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/system/liblaunch.dylib
+
+Toolchains/XcodeDefault.xctoolchain/usr/bin/bsdln
+Toolchains/XcodeDefault.xctoolchain/usr/bin/ln
diff --git a/Developer/symlinks.sh b/Developer/symlinks.sh
index 9c53a339a..06fd2f32c 100755
--- a/Developer/symlinks.sh
+++ b/Developer/symlinks.sh
@@ -1,6 +1,7 @@
 SDK="`pwd`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
 FRAMEWORKS="$SDK/System/Library/Frameworks"
 LIBS="$SDK/usr/lib"
+TOOLS="`pwd`/Toolchains/XcodeDefault.xctoolchain/usr/bin"
 
 ln -sf "$BUILD/src/external/foundation/Foundation" "$FRAMEWORKS/Foundation.framework/Versions/C"
 ln -sf "$BUILD/src/external/corefoundation/CoreFoundation" "$FRAMEWORKS/CoreFoundation.framework/Versions/A"
@@ -8,6 +9,8 @@ ln -sf "$BUILD/src/external/corefoundation/CoreFoundation" "$FRAMEWORKS/CoreFoun
 ln -sf "$BUILD/src/external/objc4/runtime/libobjc.A.dylib" "$LIBS"
 ln -sf "$BUILD/src/libsystem/libSystem.B.dylib" "$LIBS"
 
+echo $BUILD
+
 mkdir -p "$LIBS/system"
 ln -sf "$BUILD/src/sandbox/libsystem_sandbox.dylib" "$LIBS/system"
 ln -sf "$BUILD/src/quarantine/libquarantine.dylib" "$LIBS/system"
@@ -36,3 +39,6 @@ ln -sf "$BUILD/src/external/libxpc/libxpc.dylib" "$LIBS/system"
 ln -sf "$BUILD/src/external/corecrypto/libcorecrypto.dylib" "$LIBS/system"
 ln -sf "$BUILD/src/external/commoncrypto/libcommonCrypto.dylib" "$LIBS/system"
 ln -sf "$BUILD/src/launchd/liblaunch/liblaunch.dylib" "$LIBS/system"
+
+ln -sf "$BUILD/src/bsdln/bsdln" "$TOOLS/bsdln"
+ln -sf "$BUILD/src/bsdln/bsdln" "$TOOLS/ln"
diff --git a/cmake/xcproj.cmake b/cmake/xcproj.cmake
index 342ca81fc..1dfeabc68 100644
--- a/cmake/xcproj.cmake
+++ b/cmake/xcproj.cmake
@@ -1,8 +1,8 @@
 # Create developer dir symlinks
 
 add_custom_target(xcproj_symlinks
-	DEPENDS Foundation
-	COMMAND env BUILD=${CMAKE_BUID_DIR} ${CMAKE_SOURCE_DIR}/Developer/symlinks.sh
+	DEPENDS Foundation bsdln
+	COMMAND env BUILD=${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/Developer/symlinks.sh
 	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/Developer
 )
 
diff --git a/src/external/xcbuild b/src/external/xcbuild
index 14a8af687..8c837d260 160000
--- a/src/external/xcbuild
+++ b/src/external/xcbuild
@@ -1 +1 @@
-Subproject commit 14a8af687a43d11c754f97879a7a03cb5de7a511
+Subproject commit 8c837d260ce2936a7309add85e8c45199d048f0c