Add copy of static dispatch/foundation into tarball

xtremekforever · Mar 1, 2025 · 7e55a43 · 7e55a43
1 parent 4670e17
commit 7e55a43
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/build-tar.sh b/build-tar.sh
@@ -8,7 +8,9 @@ rm -rf $INSTALL_PREFIX
 mkdir -p $INSTALL_PREFIX
 cp -rf $SWIFT_INSTALL_PREFIX/* $INSTALL_PREFIX/
 cp -rf $LIBDISPATCH_INSTALL_PREFIX/* $INSTALL_PREFIX/
+cp -rf $LIBDISPATCH_STATIC_INSTALL_PREFIX/* $INSTALL_PREFIX/
 cp -rf $FOUNDATION_INSTALL_PREFIX/* $INSTALL_PREFIX/
+cp -rf $FOUNDATION_STATIC_INSTALL_PREFIX/* $INSTALL_PREFIX/
 cp -rf $XCTEST_INSTALL_PREFIX/* $INSTALL_PREFIX/
 if [ -d $SWIFT_TESTING_INSTALL_PREFIX ]; then
     cp -rf $SWIFT_TESTING_INSTALL_PREFIX/* $INSTALL_PREFIX/

diff --git a/deploy-to-sysroot.sh b/deploy-to-sysroot.sh
@@ -5,18 +5,14 @@ source swift-define
 echo "Install Dispatch to sysroot"
 cp -rf ${LIBDISPATCH_INSTALL_PREFIX}/* ${STAGING_DIR}/usr/
 
-if [ $LIBDISPATCH_STATIC_INSTALL_PREFIX ]; then
-    echo "Install Dispatch Static to sysroot"
-    cp -rf ${LIBDISPATCH_STATIC_INSTALL_PREFIX}/* ${STAGING_DIR}/usr/
-fi
+echo "Install Dispatch Static to sysroot"
+cp -rf ${LIBDISPATCH_STATIC_INSTALL_PREFIX}/* ${STAGING_DIR}/usr/
 
 echo "Install Foundation to sysroot"
 cp -rf ${FOUNDATION_INSTALL_PREFIX}/* ${STAGING_DIR}/usr/
 
-if [ $FOUNDATION_STATIC_INSTALL_PREFIX ]; then
-    echo "Install Foundation Static to sysroot"
-    cp -rf ${FOUNDATION_STATIC_INSTALL_PREFIX}/* ${STAGING_DIR}/usr/
-fi
+echo "Install Foundation Static to sysroot"
+cp -rf ${FOUNDATION_STATIC_INSTALL_PREFIX}/* ${STAGING_DIR}/usr/
 
 echo "Install XCTest to sysroot"
 cp -rf ${XCTEST_INSTALL_PREFIX}/* ${STAGING_DIR}/usr/