Skip to content

[boost-modular-build] Fix lack of arm64-linux support #10814

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
strega-nil merged 7 commits into from
Apr 27, 2020
Merged

[boost-modular-build] Fix lack of arm64-linux support #10814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
81a8142
Fix boost modular build for ARM64 builds on Linux
ddavidhahn Apr 13, 2020
f90a949
Merge branch 'master' of https://github.com/microsoft/vcpkg
ddavidhahn Apr 13, 2020
8e32927
Add error message
ddavidhahn Apr 13, 2020
0f20853
Fix endif error
ddavidhahn Apr 13, 2020
53f111b
Fix typo in error msg
ddavidhahn Apr 13, 2020
4c085f3
Bump up version
ddavidhahn Apr 14, 2020
31c1036
Merge branch 'master' of https://github.com/microsoft/vcpkg
ddavidhahn Apr 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/boost-modular-build-helper/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Source: boost-modular-build-helper
Version: 1.72.0-1
Version: 1.72.0-2
10 changes: 8 additions & 2 deletions ports/boost-modular-build-helper/boost-modular-build.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ function(boost_modular_build)
endif()

# Todo: this serves too similar a purpose as vcpkg_find_acquire_program()
if(CMAKE_HOST_WIN32 AND VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
set(BOOST_BUILD_PATH "${CURRENT_INSTALLED_DIR}/../x64-linux/tools/boost-build")
elseif(CMAKE_HOST_WIN32 AND VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
get_filename_component(BOOST_BUILD_PATH "${CURRENT_INSTALLED_DIR}/../x86-windows/tools/boost-build" ABSOLUTE)
elseif(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
get_filename_component(BOOST_BUILD_PATH "${CURRENT_INSTALLED_DIR}/../x86-windows/tools/boost-build" ABSOLUTE)
Expand All @@ -15,7 +17,11 @@ function(boost_modular_build)
endif()

if(NOT EXISTS "${BOOST_BUILD_PATH}")
message(FATAL_ERROR "The x86 boost-build tools must be installed to build for non-x86/x64 platforms. Please run `vcpkg install boost-build:x86-windows`.")
if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
message(FATAL_ERROR "The x64 boost-build tools must be installed to build arm64 for Linux. Please run `vcpkg install boost-build:x64-linux`.")
else()
message(FATAL_ERROR "The x86 boost-build tools must be installed to build for non-x86/x64 platforms. Please run `vcpkg install boost-build:x86-windows`.")
endif()
endif()

if(EXISTS "${BOOST_BUILD_PATH}/b2.exe")
Expand Down