diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index 3acc75afda72a2..dbc7387ace682a 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -99,7 +99,7 @@ function(boost_modular_build) vcpkg_install_cmake() endfunction() - if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND NOT (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" AND (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "iOS" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin"))) set(build_flag 0) if(NOT DEFINED VCPKG_BUILD_TYPE) set(build_flag 1) diff --git a/ports/boost-modular-build-helper/user-config.jam b/ports/boost-modular-build-helper/user-config.jam index 550423965fd33c..65b37d460b2f23 100644 --- a/ports/boost-modular-build-helper/user-config.jam +++ b/ports/boost-modular-build-helper/user-config.jam @@ -8,9 +8,37 @@ if "@VCPKG_PLATFORM_TOOLSET@" != "external" @TOOLSET_OPTIONS@ ; } +else if "@VCPKG_TARGET_ARCHITECTURE@" = "arm64" && "@VCPKG_CMAKE_SYSTEM_NAME@" = "iOS" +{ + using gcc : 12.0.0 : @CMAKE_CXX_COMPILER@ + : + @CMAKE_RANLIB@ + @CMAKE_AR@ + @CXXFLAGS@ + @CFLAGS@ + @LDFLAGS@ + # MINGW here causes b2 to not run cygpath + mingw + "-std=c++14 -stdlib=libc++ -DNDEBUG -arch arm64 -fembed-bitcode -Wno-unused-local-typedef -Wno-nullability-completeness -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk" + ; +} +else if "@VCPKG_TARGET_ARCHITECTURE@" = "arm64" && "@VCPKG_CMAKE_SYSTEM_NAME@" = "Darwin" +{ + using gcc : 12.0.0 : @CMAKE_CXX_COMPILER@ + : + @CMAKE_RANLIB@ + @CMAKE_AR@ + @CXXFLAGS@ + @CFLAGS@ + @LDFLAGS@ + # MINGW here causes b2 to not run cygpath + mingw + "-std=c++14 -stdlib=libc++ -DNDEBUG -arch arm64 -fembed-bitcode -Wno-unused-local-typedef -Wno-nullability-completeness -mmacosx-version-min=10.12 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" + ; +} else { - using gcc : 5.4.1 : @CMAKE_CXX_COMPILER@ + using gcc : 12.0.0 : @CMAKE_CXX_COMPILER@ : @CMAKE_RANLIB@ @CMAKE_AR@ diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index e8475362d26a99..699b93b47809bf 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,7 +1,7 @@ { "name": "boost-modular-build-helper", "version-string": "1.75.0", - "port-version": 9, + "port-version": 10, "dependencies": [ "boost-build", "boost-uninstall" diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index cdd24d924b3fb3..e719ec5804488f 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac3d5070ffc8f8ed8a1e6d260fc864e451e49a2d", + "version-string": "1.75.0", + "port-version": 10 + }, { "git-tree": "c475b268ac42e886acfdc783944e1e3a988b0ac8", "version-string": "1.75.0", diff --git a/versions/baseline.json b/versions/baseline.json index 04a640f234e71b..f9c3735da04034 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -722,7 +722,7 @@ }, "boost-modular-build-helper": { "baseline": "1.75.0", - "port-version": 9 + "port-version": 10 }, "boost-move": { "baseline": "1.75.0",