Skip to content

Commit cd79125

Browse files
fix building boost.locale for iOS and tvOS
pass compile flags also to cxx and linker
1 parent b5c364c commit cd79125

File tree

1 file changed

+18
-12
lines changed

1 file changed

+18
-12
lines changed

boost.sh

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -720,42 +720,48 @@ updateBoost()
720720
USING_MPI="using mpi ;" # trailing space needed
721721
fi
722722

723+
COMMON_FLAGS_IOS="$OTHER_FLAGS ${IOS_ARCH_FLAGS[*]} $EXTRA_IOS_FLAGS -isysroot $IOS_SDK_PATH"
724+
COMMON_FLAGS_IOS_SIM="$OTHER_FLAGS ${IOS_SIM_ARCH_FLAGS[*]} $EXTRA_IOS_SIM_FLAGS -isysroot $IOSSIM_SDK_PATH"
725+
726+
COMMON_FLAGS_TVOS="$OTHER_FLAGS -arch $TVOS_ARCH $EXTRA_TVOS_FLAGS -isysroot $TVOS_SDK_PATH"
727+
COMMON_FLAGS_TVOS_SIM="$OTHER_FLAGS -arch x86_64 $EXTRA_TVOS_SIM_FLAGS -isysroot $TVOSSIM_SDK_PATH"
728+
723729
cat > "$BOOST_SRC/tools/build/src/user-config.jam" <<EOF
724730
using darwin : $COMPILER_VERSION~iphone
725731
: $COMPILER
726732
: <architecture>arm
727733
<target-os>iphone
728-
<cxxflags>"$CXX_FLAGS"
729-
<linkflags>"$LD_FLAGS"
730-
<compileflags>"$OTHER_FLAGS ${IOS_ARCH_FLAGS[*]} $EXTRA_IOS_FLAGS -isysroot $IOS_SDK_PATH"
734+
<cxxflags>"$CXX_FLAGS $COMMON_FLAGS_IOS"
735+
<linkflags>"$LD_FLAGS $COMMON_FLAGS_IOS"
736+
<compileflags>"$COMMON_FLAGS_IOS"
731737
<threading>multi
732738
733739
;
734740
using darwin : $COMPILER_VERSION~iphonesim
735741
: $COMPILER
736742
: <architecture>x86
737743
<target-os>iphone
738-
<cxxflags>"$CXX_FLAGS"
739-
<linkflags>"$LD_FLAGS"
740-
<compileflags>"$OTHER_FLAGS ${IOS_SIM_ARCH_FLAGS[*]} $EXTRA_IOS_SIM_FLAGS -isysroot $IOSSIM_SDK_PATH"
744+
<cxxflags>"$CXX_FLAGS $COMMON_FLAGS_IOS_SIM"
745+
<linkflags>"$LD_FLAGS $COMMON_FLAGS_IOS_SIM"
746+
<compileflags>"$COMMON_FLAGS_IOS_SIM"
741747
<threading>multi
742748
;
743749
using darwin : $COMPILER_VERSION~appletv
744750
: $COMPILER
745751
: <architecture>arm
746752
<target-os>iphone
747-
<cxxflags>"$CXX_FLAGS"
748-
<linkflags>"$LD_FLAGS"
749-
<compileflags>"$OTHER_FLAGS -arch arm64 $EXTRA_TVOS_FLAGS -isysroot $TVOS_SDK_PATH"
753+
<cxxflags>"$CXX_FLAGS $COMMON_FLAGS_TVOS"
754+
<linkflags>"$LD_FLAGS $COMMON_FLAGS_TVOS"
755+
<compileflags>"$COMMON_FLAGS_TVOS"
750756
<threading>multi
751757
;
752758
using darwin : $COMPILER_VERSION~appletvsim
753759
: $COMPILER
754760
: <architecture>x86
755761
<target-os>iphone
756-
<cxxflags>"$CXX_FLAGS"
757-
<linkflags>"$LD_FLAGS"
758-
<compileflags>"$OTHER_FLAGS -arch x86_64 $EXTRA_TVOS_SIM_FLAGS -isysroot $TVOSSIM_SDK_PATH"
762+
<cxxflags>"$CXX_FLAGS $COMMON_FLAGS_TVOS_SIM"
763+
<linkflags>"$LD_FLAGS $COMMON_FLAGS_TVOS_SIM"
764+
<compileflags>"$COMMON_FLAGS_TVOS_SIM"
759765
<threading>multi
760766
;
761767
using darwin : $COMPILER_VERSION~macos

0 commit comments

Comments
 (0)