Skip to content

[scripts] vcpkg_configure_make: do not set --build on macOS #16596

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
ras0219-msft merged 2 commits into from
Mar 22, 2021
Merged

[scripts] vcpkg_configure_make: do not set --build on macOS #16596

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e6c8c0
[scripts] vcpkg_configure_make: do not set --build on macOS
autoantwort Mar 8, 2021
124ba36
[scripts] vcpkg_configure_make: do not set --host on macOS
autoantwort Mar 8, 2021
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
4 changes: 1 addition & 3 deletions scripts/cmake/vcpkg_configure_make.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,10 +437,8 @@ function(vcpkg_configure_make)
# --target: the machine that CC will produce binaries for
# https://stackoverflow.com/questions/21990021/how-to-determine-host-value-for-configure-when-using-cross-compiler
# Only for ports using autotools so we can assume that they follow the common conventions for build/target/host
set(_csc_BUILD_TRIPLET "--build=${BUILD_ARCH}-apple-darwin")
if(NOT "${TARGET_ARCH}" STREQUAL "${BUILD_ARCH}") # we don't need to specify the additional flags if we build natively.

list(APPEND _csc_BUILD_TRIPLET "--host=${TARGET_ARCH}-apple-darwin") # (Host activates crosscompilation; The name given here is just the prefix of the host tools for the target)
set(_csc_BUILD_TRIPLET "--host=${TARGET_ARCH}-apple-darwin") # (Host activates crosscompilation; The name given here is just the prefix of the host tools for the target)
endif()
debug_message("Using make triplet: ${_csc_BUILD_TRIPLET}")
endif()
Expand Down