diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt index dfc10343a7f519..12f975b4568e25 100644 --- a/ports/boost-modular-build-helper/CMakeLists.txt +++ b/ports/boost-modular-build-helper/CMakeLists.txt @@ -130,6 +130,13 @@ string(STRIP "${CFLAGS}" CFLAGS) string(REGEX REPLACE "[ \t\r\n]+" " " LDFLAGS "${LDFLAGS}") string(STRIP "${LDFLAGS}" LDFLAGS) +# When building a static lib with MSVC, you need to use archiveflags instead of linkflags. +# This is set via the b2 command line since putting in the user-config.jam +# file doesn't seem to work like it does for . +if(MSVC AND NOT BUILD_SHARED_LIBS) + list(APPEND B2_OPTIONS "\"archiveflags=${LDFLAGS}\"") +endif() + if(NOT CXXFLAGS STREQUAL "") string(REPLACE " " " " CXXFLAGS "${CXXFLAGS}") endif() diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index 31ea55e28933e1..e4c24ad9110422 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": "1.78.0", - "port-version": 2, + "port-version": 3, "description": "Internal vcpkg port used to build Boost libraries", "dependencies": [ "boost-uninstall", diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index e45e0fbada2b09..3a925e31999dc4 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4211622aebc0f2bbaaee3edab6dcbc755d1cac26", + "version": "1.78.0", + "port-version": 3 + }, { "git-tree": "9400b3bfdc93a165b3b509a76c59107c020113a6", "version": "1.78.0", diff --git a/versions/baseline.json b/versions/baseline.json index 715f5d82aee1cc..784c686eb3715e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -822,7 +822,7 @@ }, "boost-modular-build-helper": { "baseline": "1.78.0", - "port-version": 2 + "port-version": 3 }, "boost-move": { "baseline": "1.78.0",