@@ -729,42 +729,48 @@ updateBoostUserConfigJam()
729729 USING_MPI=" using mpi ;" # trailing space needed
730730 fi
731731
732+ COMMON_FLAGS_IOS=" $OTHER_FLAGS ${IOS_ARCH_FLAGS[*]} $EXTRA_IOS_FLAGS -isysroot $IOS_SDK_PATH "
733+ COMMON_FLAGS_IOS_SIM=" $OTHER_FLAGS ${IOS_SIM_ARCH_FLAGS[*]} $EXTRA_IOS_SIM_FLAGS -isysroot $IOSSIM_SDK_PATH "
734+
735+ COMMON_FLAGS_TVOS=" $OTHER_FLAGS ${TVOS_ARCH_FLAGS[*]} $EXTRA_TVOS_FLAGS -isysroot $TVOS_SDK_PATH "
736+ COMMON_FLAGS_TVOS_SIM=" $OTHER_FLAGS ${TVOS_SIM_ARCH_FLAGS[*]} $EXTRA_TVOS_SIM_FLAGS -isysroot $TVOSSIM_SDK_PATH "
737+
732738 cat > " $BOOST_SRC /tools/build/src/user-config.jam" << EOF
733739using darwin : $COMPILER_VERSION ~iphone
734740: $COMPILER
735741: <architecture>arm
736742 <target-os>iphone
737- <cxxflags>"$CXX_FLAGS "
738- <linkflags>"$LD_FLAGS "
739- <compileflags>"$OTHER_FLAGS ${IOS_ARCH_FLAGS[*]} $EXTRA_IOS_FLAGS -isysroot $IOS_SDK_PATH "
743+ <cxxflags>"$CXX_FLAGS $COMMON_FLAGS_IOS "
744+ <linkflags>"$LD_FLAGS $COMMON_FLAGS_IOS "
745+ <compileflags>"$COMMON_FLAGS_IOS "
740746 <threading>multi
741747
742748;
743749using darwin : $COMPILER_VERSION ~iphonesim
744750: $COMPILER
745751: <architecture>x86
746752 <target-os>iphone
747- <cxxflags>"$CXX_FLAGS "
748- <linkflags>"$LD_FLAGS "
749- <compileflags>"$OTHER_FLAGS ${IOS_SIM_ARCH_FLAGS[*]} $EXTRA_IOS_SIM_FLAGS -isysroot $IOSSIM_SDK_PATH "
753+ <cxxflags>"$CXX_FLAGS $COMMON_FLAGS_IOS_SIM "
754+ <linkflags>"$LD_FLAGS $COMMON_FLAGS_IOS_SIM "
755+ <compileflags>"$COMMON_FLAGS_IOS_SIM "
750756 <threading>multi
751757;
752758using darwin : $COMPILER_VERSION ~appletv
753759: $COMPILER
754760: <architecture>arm
755761 <target-os>iphone
756- <cxxflags>"$CXX_FLAGS "
757- <linkflags>"$LD_FLAGS "
758- <compileflags>"$OTHER_FLAGS ${TVOS_ARCH_FLAGS[*]} $EXTRA_TVOS_FLAGS -isysroot $TVOS_SDK_PATH "
762+ <cxxflags>"$CXX_FLAGS $COMMON_FLAGS_TVOS "
763+ <linkflags>"$LD_FLAGS $COMMON_FLAGS_TVOS "
764+ <compileflags>"$COMMON_FLAGS_TVOS "
759765 <threading>multi
760766;
761767using darwin : $COMPILER_VERSION ~appletvsim
762768: $COMPILER
763769: <architecture>x86
764770 <target-os>iphone
765- <cxxflags>"$CXX_FLAGS "
766- <linkflags>"$LD_FLAGS "
767- <compileflags>"$OTHER_FLAGS ${TVOS_SIM_ARCH_FLAGS[*]} $EXTRA_TVOS_SIM_FLAGS -isysroot $TVOSSIM_SDK_PATH "
771+ <cxxflags>"$CXX_FLAGS $COMMON_FLAGS_TVOS_SIM "
772+ <linkflags>"$LD_FLAGS $COMMON_FLAGS_TVOS_SIM "
773+ <compileflags>"$COMMON_FLAGS_TVOS_SIM "
768774 <threading>multi
769775;
770776using darwin : $COMPILER_VERSION ~macos
0 commit comments