File tree Expand file tree Collapse file tree 1 file changed +6
-2
lines changed Expand file tree Collapse file tree 1 file changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -137,7 +137,8 @@ if [[ " ${platforms[@]} " =~ " simulator " ]]; then
137
137
if [ " $osx_sysroot " == " " ]; then
138
138
osx_sysroot=${SIMULATOR_OSX_SYSROOT}
139
139
else
140
- osx_sysroot=" ${osx_sysroot} ;${SIMULATOR_OSX_SYSROOT} "
140
+ # We want this to be empty when building for both
141
+ osx_sysroot=" "
141
142
fi
142
143
if [ " $xcode_platforms " == " " ]; then
143
144
xcode_platforms=" -${SIMULATOR_OSX_SYSROOT} "
@@ -193,11 +194,14 @@ mkdir -p "$buildpath"
193
194
194
195
pushd " $buildpath "
195
196
197
+ if [ " $osx_sysroot " != " " ]; then
198
+ CMAKE_OPTIONS=" ${CMAKE_OPTIONS} -DCMAKE_OSX_SYSROOT=$osx_sysroot "
199
+ fi
200
+
196
201
# Configure cmake with option value
197
202
cmake $sourcepath \
198
203
-DCMAKE_TOOLCHAIN_FILE=$sourcepath /cmake/unity_ios.cmake \
199
204
-DCMAKE_OSX_ARCHITECTURES=$cmake_archs \
200
- -DCMAKE_OSX_SYSROOT=$osx_sysroot \
201
205
-DCMAKE_XCODE_EFFECTIVE_PLATFORMS=$xcode_platforms \
202
206
-DIOS_PLATFORM_LOCATION=$ios_location \
203
207
-DUNITY_ROOT_DIR=${UNITY_ROOT_DIR} \
You can’t perform that action at this time.
0 commit comments