@@ -745,42 +745,48 @@ updateBoostUserConfigJam()
745745 USING_MPI=" using mpi ;" # trailing space needed
746746 fi
747747
748+ COMMON_FLAGS_IOS=" $OTHER_FLAGS ${IOS_ARCH_FLAGS[*]} $EXTRA_IOS_FLAGS -isysroot $IOS_SDK_PATH "
749+ COMMON_FLAGS_IOS_SIM=" $OTHER_FLAGS ${IOS_SIM_ARCH_FLAGS[*]} $EXTRA_IOS_SIM_FLAGS -isysroot $IOSSIM_SDK_PATH "
750+
751+ COMMON_FLAGS_TVOS=" $OTHER_FLAGS ${TVOS_ARCH_FLAGS[*]} $EXTRA_TVOS_FLAGS -isysroot $TVOS_SDK_PATH "
752+ COMMON_FLAGS_TVOS_SIM=" $OTHER_FLAGS ${TVOS_SIM_ARCH_FLAGS[*]} $EXTRA_TVOS_SIM_FLAGS -isysroot $TVOSSIM_SDK_PATH "
753+
748754 cat > " $BOOST_SRC /tools/build/src/user-config.jam" << EOF
749755using darwin : $COMPILER_VERSION ~iphone
750756: $COMPILER
751757: <architecture>arm
752758 <target-os>iphone
753- <cxxflags>"$CXX_FLAGS "
754- <linkflags>"$LD_FLAGS -isysroot $IOS_SDK_PATH "
755- <compileflags>"$OTHER_FLAGS ${IOS_ARCH_FLAGS[*]} $EXTRA_IOS_FLAGS -isysroot $IOS_SDK_PATH "
759+ <cxxflags>"$CXX_FLAGS $COMMON_FLAGS_IOS "
760+ <linkflags>"$LD_FLAGS $COMMON_FLAGS_IOS "
761+ <compileflags>"$COMMON_FLAGS_IOS "
756762 <threading>multi
757763
758764;
759765using darwin : $COMPILER_VERSION ~iphonesim
760766: $COMPILER
761767: <architecture>x86
762768 <target-os>iphone
763- <cxxflags>"$CXX_FLAGS "
764- <linkflags>"$LD_FLAGS -isysroot $IOSSIM_SDK_PATH "
765- <compileflags>"$OTHER_FLAGS ${IOS_SIM_ARCH_FLAGS[*]} $EXTRA_IOS_SIM_FLAGS -isysroot $IOSSIM_SDK_PATH "
769+ <cxxflags>"$CXX_FLAGS $COMMON_FLAGS_IOS_SIM "
770+ <linkflags>"$LD_FLAGS $COMMON_FLAGS_IOS_SIM "
771+ <compileflags>"$COMMON_FLAGS_IOS_SIM "
766772 <threading>multi
767773;
768774using darwin : $COMPILER_VERSION ~appletv
769775: $COMPILER
770776: <architecture>arm
771777 <target-os>iphone
772- <cxxflags>"$CXX_FLAGS "
773- <linkflags>"$LD_FLAGS -isysroot $TVOS_SDK_PATH "
774- <compileflags>"$OTHER_FLAGS ${TVOS_ARCH_FLAGS[*]} $EXTRA_TVOS_FLAGS -isysroot $TVOS_SDK_PATH "
778+ <cxxflags>"$CXX_FLAGS $COMMON_FLAGS_TVOS "
779+ <linkflags>"$LD_FLAGS $COMMON_FLAGS_TVOS "
780+ <compileflags>"$COMMON_FLAGS_TVOS "
775781 <threading>multi
776782;
777783using darwin : $COMPILER_VERSION ~appletvsim
778784: $COMPILER
779785: <architecture>x86
780786 <target-os>iphone
781- <cxxflags>"$CXX_FLAGS "
782- <linkflags>"$LD_FLAGS -isysroot $TVOSSIM_SDK_PATH "
783- <compileflags>"$OTHER_FLAGS ${TVOS_SIM_ARCH_FLAGS[*]} $EXTRA_TVOS_SIM_FLAGS -isysroot $TVOSSIM_SDK_PATH "
787+ <cxxflags>"$CXX_FLAGS $COMMON_FLAGS_TVOS_SIM "
788+ <linkflags>"$LD_FLAGS $COMMON_FLAGS_TVOS_SIM "
789+ <compileflags>"$COMMON_FLAGS_TVOS_SIM "
784790 <threading>multi
785791;
786792using darwin : $COMPILER_VERSION ~macos
0 commit comments