aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2018-05-14 17:10:20 -0700
committerRobert Schumacher <roschuma@microsoft.com>2018-05-15 21:45:02 -0700
commitb6f1217a63577c7040093e92b96994e43810cca8 (patch)
tree34daa5614ae34231864df13ba0efcf0dbdd006e6
parent8ce92654856897d5da7649ecea5d28818f3bcadd (diff)
downloadvcpkg-b6f1217a63577c7040093e92b96994e43810cca8.tar.gz
vcpkg-b6f1217a63577c7040093e92b96994e43810cca8.zip
[boost-modular-build-helper] Pass address-model=64 on all 64-bit platforms.
-rw-r--r--ports/boost-modular-build-helper/CMakeLists.txt4
-rw-r--r--ports/boost-modular-build-helper/CONTROL2
2 files changed, 4 insertions, 2 deletions
diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt
index f75a6ee66..dc4d13dd1 100644
--- a/ports/boost-modular-build-helper/CMakeLists.txt
+++ b/ports/boost-modular-build-helper/CMakeLists.txt
@@ -28,8 +28,10 @@ else()
list(APPEND B2_OPTIONS link=static)
endif()
-if(CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64")
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
list(APPEND B2_OPTIONS address-model=64)
+else()
+ list(APPEND B2_OPTIONS address-model=32)
endif()
if(APPLE)
diff --git a/ports/boost-modular-build-helper/CONTROL b/ports/boost-modular-build-helper/CONTROL
index 7324d6ba0..0ee783390 100644
--- a/ports/boost-modular-build-helper/CONTROL
+++ b/ports/boost-modular-build-helper/CONTROL
@@ -1,2 +1,2 @@
Source: boost-modular-build-helper
-Version: 2018-04-16-4
+Version: 2018-05-14