---

yaml
---
r: 346693
b: refs/heads/master
c: 782fbec
h: refs/heads/master
i:
  346691: 694add6

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 70946a6839cebe711280181f875eecc163ea2aca
+refs/heads/master: 782fbec4ffc1eacef9b49a2dabe392a782d726ff
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/utils/build-presets.ini

@@ -1781,3 +1781,4 @@ build-libparser-only
 swiftsyntax
 verbose-build
 skip-swiftsyntax-swiftside
+darwin-install-extract-symbols

trunk/utils/build-script-impl

@@ -3817,29 +3817,39 @@ for host in "${ALL_HOSTS[@]}"; do
             call darwin_install_extract_symbols
         else
             set -x
+            if [ "${BUILD_LIBPARSER_ONLY}" ]; then
+                # We don't have a toolchain so we should install to the specified dir
+                CURRENT_INSTALL_DIR="${INSTALL_DESTDIR}"
+                CURRENT_PREFIX="/."
+            else
+                # If we have a toolchain, use the toolchain install dir.
+                CURRENT_INSTALL_DIR=${host_install_destdir}
+                CURRENT_PREFIX="${TOOLCHAIN_PREFIX}"
+            fi
+
             # Copy executables and shared libraries from the `host_install_destdir` to
             # INSTALL_SYMROOT and run dsymutil on them.
-            (cd "${host_install_destdir}" &&
-             find ./"${TOOLCHAIN_PREFIX}" -perm -0111 -type f -print | cpio --insecure -pdm "${INSTALL_SYMROOT}")
+            (cd "${CURRENT_INSTALL_DIR}" &&
+             find ./"${CURRENT_PREFIX}" -perm -0111 -type f -print | cpio --insecure -pdm "${INSTALL_SYMROOT}")
 
             # Run dsymutil on executables and shared libraries.
             #
             # Exclude shell scripts.
             (cd "${INSTALL_SYMROOT}" &&
-             find ./"${TOOLCHAIN_PREFIX}" -perm -0111 -type f -print | \
+             find ./"${CURRENT_PREFIX}" -perm -0111 -type f -print | \
                grep -v crashlog.py | \
                grep -v symbolication.py | \
                xargs -n 1 -P ${BUILD_JOBS} $(xcrun_find_tool dsymutil))
 
             # Strip executables, shared libraries and static libraries in
             # `host_install_destdir`.
-            find "${host_install_destdir}${TOOLCHAIN_PREFIX}/" \
+            find "${CURRENT_INSTALL_DIR}${CURRENT_PREFIX}/" \
               '(' -perm -0111 -or -name "*.a" ')' -type f -print | \
               xargs -n 1 -P ${BUILD_JOBS} $(xcrun_find_tool strip) -S
 
             # Codesign dylibs after strip tool
             # rdar://45388785
-            find "${host_install_destdir}${TOOLCHAIN_PREFIX}/" \
+            find "${CURRENT_INSTALL_DIR}${CURRENT_PREFIX}/" \
               '(' -name "*.dylib" ')' -type f -print | \
               xargs -n 1 -P ${BUILD_JOBS} $(xcrun_find_tool codesign) -f -s -