diff options
| author | Andrei Lebedev <lebdron@gmail.com> | 2021-01-22 19:37:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-22 10:37:26 -0800 |
| commit | 83b8e27b95e0117a80fe5e2e4749ecaede098fa0 (patch) | |
| tree | 20bf19eea3665ccefe712d2c3592a4626d1a8843 /scripts | |
| parent | 34a9432e2ba94bb4aa9bbbeb2a92aa3c0b1717a0 (diff) | |
| download | vcpkg-83b8e27b95e0117a80fe5e2e4749ecaede098fa0.tar.gz vcpkg-83b8e27b95e0117a80fe5e2e4749ecaede098fa0.zip | |
[vcpkg,boost-modular-build-helper] initial ppc64le community support (#15572)
* [vcpkg] initial ppc64le community support
Signed-off-by: Andrei Lebedev <lebdron@gmail.com>
* [boost-modular-build-helper] ppc64le support
Signed-off-by: Andrei Lebedev <lebdron@gmail.com>
* Merge from master
Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Co-authored-by: dan-shaw <51385773+dan-shaw@users.noreply.github.com>
Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/bootstrap.sh | 4 | ||||
| -rw-r--r-- | scripts/buildsystems/vcpkg.cmake | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index ba76f4f63..b7d889f9e 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -240,8 +240,8 @@ selectCXX() UNAME="$(uname)" ARCH="$(uname -m)" -# Force using system utilities for building vcpkg if host arch is arm, arm64, or s390x. -if [ "$ARCH" = "armv7l" -o "$ARCH" = "aarch64" -o "$ARCH" = "s390x" ]; then +# Force using system utilities for building vcpkg if host arch is arm, arm64, s390x, or ppc64le. +if [ "$ARCH" = "armv7l" -o "$ARCH" = "aarch64" -o "$ARCH" = "s390x" -o "$ARCH" = "ppc64le" ]; then vcpkgUseSystem=true fi diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index e13c3333b..296920939 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -198,6 +198,8 @@ else() set(_VCPKG_TARGET_TRIPLET_ARCH x64) elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "s390x") set(_VCPKG_TARGET_TRIPLET_ARCH s390x) + elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "ppc64le") + set(_VCPKG_TARGET_TRIPLET_ARCH ppc64le) elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "armv7l") set(_VCPKG_TARGET_TRIPLET_ARCH arm) elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64") |