@@ -723,42 +723,48 @@ updateBoost()
723723 USING_MPI=" using mpi ;" # trailing space needed
724724 fi
725725
726+ COMMON_FLAGS_IOS=" $OTHER_FLAGS ${IOS_ARCH_FLAGS[*]} $EXTRA_IOS_FLAGS -isysroot $IOS_SDK_PATH "
727+ COMMON_FLAGS_IOS_SIM=" $OTHER_FLAGS ${IOS_SIM_ARCH_FLAGS[*]} $EXTRA_IOS_SIM_FLAGS -isysroot $IOSSIM_SDK_PATH "
728+
729+ COMMON_FLAGS_TVOS=" $OTHER_FLAGS -arch arm64 $EXTRA_TVOS_FLAGS -isysroot $TVOS_SDK_PATH "
730+ COMMON_FLAGS_TVOS_SIM=" $OTHER_FLAGS -arch x86_64 $EXTRA_TVOS_SIM_FLAGS -isysroot $TVOSSIM_SDK_PATH "
731+
726732 cat > " $BOOST_SRC /tools/build/src/user-config.jam" << EOF
727733using darwin : $COMPILER_VERSION ~iphone
728734: $COMPILER
729735: <architecture>arm
730736 <target-os>iphone
731- <cxxflags>"$CXX_FLAGS "
732- <linkflags>"$LD_FLAGS "
733- <compileflags>"$OTHER_FLAGS ${IOS_ARCH_FLAGS[*]} $EXTRA_IOS_FLAGS -isysroot $IOS_SDK_PATH "
737+ <cxxflags>"$CXX_FLAGS $COMMON_FLAGS_IOS "
738+ <linkflags>"$LD_FLAGS $COMMON_FLAGS_IOS "
739+ <compileflags>"$COMMON_FLAGS_IOS "
734740 <threading>multi
735741
736742;
737743using darwin : $COMPILER_VERSION ~iphonesim
738744: $COMPILER
739745: <architecture>x86
740746 <target-os>iphone
741- <cxxflags>"$CXX_FLAGS "
742- <linkflags>"$LD_FLAGS "
743- <compileflags>"$OTHER_FLAGS ${IOS_SIM_ARCH_FLAGS[*]} $EXTRA_IOS_SIM_FLAGS -isysroot $IOSSIM_SDK_PATH "
747+ <cxxflags>"$CXX_FLAGS $COMMON_FLAGS_IOS_SIM "
748+ <linkflags>"$LD_FLAGS $COMMON_FLAGS_IOS_SIM "
749+ <compileflags>"$COMMON_FLAGS_IOS_SIM "
744750 <threading>multi
745751;
746752using darwin : $COMPILER_VERSION ~appletv
747753: $COMPILER
748754: <architecture>arm
749755 <target-os>iphone
750- <cxxflags>"$CXX_FLAGS "
751- <linkflags>"$LD_FLAGS "
752- <compileflags>"$OTHER_FLAGS -arch arm64 $EXTRA_TVOS_FLAGS -isysroot $TVOS_SDK_PATH "
756+ <cxxflags>"$CXX_FLAGS $COMMON_FLAGS_TVOS "
757+ <linkflags>"$LD_FLAGS $COMMON_FLAGS_TVOS "
758+ <compileflags>"$COMMON_FLAGS_TVOS "
753759 <threading>multi
754760;
755761using darwin : $COMPILER_VERSION ~appletvsim
756762: $COMPILER
757763: <architecture>x86
758764 <target-os>iphone
759- <cxxflags>"$CXX_FLAGS "
760- <linkflags>"$LD_FLAGS "
761- <compileflags>"$OTHER_FLAGS -arch x86_64 $EXTRA_TVOS_SIM_FLAGS -isysroot $TVOSSIM_SDK_PATH "
765+ <cxxflags>"$CXX_FLAGS $COMMON_FLAGS_TVOS_SIM "
766+ <linkflags>"$LD_FLAGS $COMMON_FLAGS_TVOS_SIM "
767+ <compileflags>"$COMMON_FLAGS_TVOS_SIM "
762768 <threading>multi
763769;
764770using darwin : $COMPILER_VERSION ~macos
0 commit comments