@@ -71,18 +71,24 @@ if [ "$PLATFORM_PREFERRED_ARCH" == "arm64" ]; then
7171else
7272 PREBUILD_ARCH=" x64"
7373fi
74+ if [ " $PLATFORM_NAME " == " iphonesimulator" ] && [ " $NATIVE_ARCH " == " arm64" ]; then
75+ SUFFIX=" -simulator"
76+ PREBUILD_ARCH=" arm64"
77+ else
78+ SUFFIX=" "
79+ fi
7480find -E " $NODEPROJ " \
75- ! -regex " .*/prebuilds/ios-$PREBUILD_ARCH " \
81+ ! -regex " .*/prebuilds/ios-$PREBUILD_ARCH$SUFFIX " \
7682 -regex ' .*/prebuilds/[^/]*$' -type d \
7783 -prune -exec rm -rf " {}" \;
7884find -E " $NODEPROJ " \
79- ! -regex " .*/prebuilds/ios-$PREBUILD_ARCH /.*\.node$" \
85+ ! -regex " .*/prebuilds/ios-$PREBUILD_ARCH$SUFFIX /.*\.node$" \
8086 -name ' *.node' -type f \
8187 -exec rm " {}" \;
8288find " $NODEPROJ " \
8389 -name " *.framework" -type d \
8490 -prune -exec rm -rf " {}" \;
85- for DOT_NODE in ` find -E " $NODEPROJ " -regex " .*/prebuilds/ios-$PREBUILD_ARCH /.*\.node$" ` ; do
91+ for DOT_NODE in ` find -E " $NODEPROJ " -regex " .*/prebuilds/ios-$PREBUILD_ARCH$SUFFIX /.*\.node$" ` ; do
8692 preparePrebuiltModule " $DOT_NODE "
8793done
8894
104110# Rebuild modules with right environment
105111NODEJS_HEADERS_DIR=" $( cd " $PROJECT_DIR " && cd ../node_modules/nodejs-mobile-react-native/ios/libnode/ && pwd ) "
106112pushd $NODEPROJ
107- if [ " $PLATFORM_NAME " == " iphoneos" ]
108- then
113+ if [ " $PLATFORM_NAME " == " iphoneos" ]; then
109114 GYP_DEFINES=" OS=ios" \
110- CARGO_BUILD_TARGET=" aarch64-apple-ios" \
115+ CARGO_BUILD_TARGET=" aarch64-apple-ios iossim=false" \
116+ NODEJS_MOBILE_GYP=" $NODEJS_MOBILE_GYP_BIN_FILE " \
117+ npm_config_node_gyp=" $NODEJS_MOBILE_GYP_BIN_FILE " \
118+ npm_config_nodedir=" $NODEJS_HEADERS_DIR " \
119+ npm_config_platform=" ios" \
120+ npm_config_format=" make-ios" \
121+ npm_config_arch=" arm64" \
122+ npm --verbose --foreground-scripts rebuild --build-from-source
123+ elif [ " $NATIVE_ARCH " == " arm64" ]; then
124+ GYP_DEFINES=" OS=ios target_arch=arm64 iossim=true" \
125+ CARGO_BUILD_TARGET=" aarch64-apple-ios-sim" \
111126 NODEJS_MOBILE_GYP=" $NODEJS_MOBILE_GYP_BIN_FILE " \
112127 npm_config_node_gyp=" $NODEJS_MOBILE_GYP_BIN_FILE " \
113128 npm_config_nodedir=" $NODEJS_HEADERS_DIR " \
116131 npm_config_arch=" arm64" \
117132 npm --verbose --foreground-scripts rebuild --build-from-source
118133else
119- GYP_DEFINES=" OS=ios" \
134+ GYP_DEFINES=" OS=ios target_arch=x64 iossim=true " \
120135 CARGO_BUILD_TARGET=" x86_64-apple-ios" \
121136 NODEJS_MOBILE_GYP=" $NODEJS_MOBILE_GYP_BIN_FILE " \
122137 npm_config_node_gyp=" $NODEJS_MOBILE_GYP_BIN_FILE " \
0 commit comments