Fix boost build toolchain options not being used

The issue was due to the options only being set for the gcc toolchain, and then only for a specific version. On platforms defaulting to a different toolchain (e.g. macOS) this didn't work at all. Additionally, some missing flags were not propagated, in particular the CMAKE_OSX_DEPLOYMENT_TARGET, CMAKE_OSX_SYSROOT and CMAKE_OSX_ARCHITECTURES
microsoft · Jun 21, 2021 · 1534065 · 1534065
1 parent 6e024e7
commit 1534065
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 8 deletions.
diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt
@@ -46,13 +46,17 @@ else()
 endif()
 
 if(APPLE)
-    list(APPEND B2_OPTIONS target-os=darwin toolset=clang)
+    set(B2_TOOLSET clang)
+    list(APPEND B2_OPTIONS target-os=darwin)
 elseif(WIN32)
-    list(APPEND B2_OPTIONS target-os=windows toolset=gcc)
+    set(B2_TOOLSET gcc)
+    list(APPEND B2_OPTIONS target-os=windows)
 elseif(ANDROID)
-    list(APPEND B2_OPTIONS target-os=android toolset=gcc)
+    set(B2_TOOLSET gcc)
+    list(APPEND B2_OPTIONS target-os=android)
 else()
-    list(APPEND B2_OPTIONS target-os=linux toolset=gcc)
+    set(B2_TOOLSET gcc)
+    list(APPEND B2_OPTIONS target-os=linux)
 endif()
 
 if(WIN32)
@@ -80,6 +84,28 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "Debug")
     endif()
 endif()
 
+if(APPLE)
+    if(CMAKE_OSX_DEPLOYMENT_TARGET)
+        set(CXXFLAGS "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} ${CXXFLAGS}")
+        set(CFLAGS "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} ${CFLAGS}")
+        set(LDFLAGS "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} ${LDFLAGS}")
+    endif()
+
+    if(CMAKE_OSX_SYSROOT)
+        set(CXXFLAGS "-isysroot ${CMAKE_OSX_SYSROOT} ${CXXFLAGS}")
+        set(CFLAGS "-isysroot ${CMAKE_OSX_SYSROOT} ${CFLAGS}")
+        set(LDFLAGS "-isysroot ${CMAKE_OSX_SYSROOT} ${LDFLAGS}")
+    endif()
+
+    # if specific architectures are set, configure them,
+    # if not set, this will still default to current arch
+    foreach(ARCH ${CMAKE_OSX_ARCHITECTURES})
+        set(CXXFLAGS "-arch ${ARCH} ${CXXFLAGS}")
+        set(CFLAGS "-arch ${ARCH} ${CFLAGS}")
+        set(LDFLAGS "-arch ${ARCH} ${LDFLAGS}")
+    endforeach()
+endif()
+
 string(STRIP "${CXXFLAGS}" CXXFLAGS)
 string(STRIP "${CFLAGS}"   CFLAGS)
 string(STRIP "${LDFLAGS}"  LDFLAGS)
@@ -122,7 +148,7 @@ foreach(INCDIR ${CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES})
 endforeach()
 
 if(APPLE)
-  set(CXXFLAGS "${CXXFLAGS} <compileflags>-D_DARWIN_C_SOURCE <compileflags>-std=c++11 <compileflags>-stdlib=libc++")
+  set(CXXFLAGS "${CXXFLAGS} <compileflags>-D_DARWIN_C_SOURCE <cxxflags>-std=c++11 <cxxflags>-stdlib=libc++")
   set(LDFLAGS "${LDFLAGS} <linkflags>-stdlib=libc++")
 endif()
 
@@ -157,6 +183,7 @@ endif()
 
 add_custom_target(boost ALL
     COMMAND "${B2_EXE}"
+        toolset=${B2_TOOLSET}
         --user-config=${CMAKE_CURRENT_BINARY_DIR}/user-config.jam
         --stagedir=${CMAKE_CURRENT_BINARY_DIR}/stage
         --build-dir=${CMAKE_CURRENT_BINARY_DIR}

diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake
@@ -84,6 +84,19 @@ function(boost_modular_build)
         if(DEFINED _bm_BOOST_CMAKE_FRAGMENT)
             list(APPEND configure_option "-DBOOST_CMAKE_FRAGMENT=${_bm_BOOST_CMAKE_FRAGMENT}")
         endif()
+        if(VCPKG_TARGET_IS_OSX)
+            if(VCPKG_OSX_DEPLOYMENT_TARGET)
+                list(APPEND configure_options "-DCMAKE_OSX_DEPLOYMENT_TARGET=${VCPKG_OSX_DEPLOYMENT_TARGET}")
+            endif()
+            if(VCPKG_OSX_SYSROOT)
+                list(APPEND configure_options "-DCMAKE_OSX_SYSROOT=${VCPKG_OSX_SYSROOT}")
+            endif()
+            if(VCPKG_OSX_ARCHITECTURES)
+                # note: VCPKG_OSX_ARCHITECTURES is a list and must be enclosed in quotes
+                list(APPEND configure_options "-DCMAKE_OSX_ARCHITECTURES=\"${VCPKG_OSX_ARCHITECTURES}\"")
+            endif()
+        endif()
+
         vcpkg_configure_cmake(
             SOURCE_PATH ${BOOST_BUILD_INSTALLED_DIR}/share/boost-build
             PREFER_NINJA

diff --git a/ports/boost-modular-build-helper/user-config.jam b/ports/boost-modular-build-helper/user-config.jam
@@ -10,7 +10,7 @@ if "@VCPKG_PLATFORM_TOOLSET@" != "external"
 }
 else
 {
-    using gcc : 5.4.1 : @CMAKE_CXX_COMPILER@
+    using @B2_TOOLSET@ : : @CMAKE_CXX_COMPILER@
         :
         <ranlib>@CMAKE_RANLIB@
         <archiver>@CMAKE_AR@

diff --git 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
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "09b58787785be0fcc5fb86560ef421eb341aa537",
+      "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
@@ -738,7 +738,7 @@
     },
     "boost-modular-build-helper": {
       "baseline": "1.75.0",
-      "port-version": 9
+      "port-version": 10
     },
     "boost-move": {
       "baseline": "1.75.0",