[vcpkg] improve s390x support

Signed-off-by: Andrei Lebedev <lebdron@gmail.com>
microsoft · Sep 7, 2020 · 8c4b4c2 · 8c4b4c2
1 parent 49c1b28
commit 8c4b4c2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
@@ -238,8 +238,8 @@ selectCXX()
 UNAME="$(uname)"
 ARCH="$(uname -m)"
 
-# Force using system utilities for building vcpkg if host arch is arm or arm64.
-if [ "$ARCH" = "armv7l" -o "$ARCH" = "aarch64" ]; then
+# 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
     vcpkgUseSystem=true
 fi
 

diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp
@@ -235,11 +235,13 @@ int main(const int argc, const char* const* const argv)
 
     load_config(fs);
 
-#if (defined(__aarch64__) || defined(__arm__) || defined(_M_ARM) || defined(_M_ARM64)) && !defined(_WIN32)
+#if (defined(__aarch64__) || defined(__arm__) || defined(__s390x__) || defined(_M_ARM) || defined(_M_ARM64)) &&        \
+    !defined(_WIN32)
     if (!System::get_environment_variable("VCPKG_FORCE_SYSTEM_BINARIES").has_value())
     {
-        Checks::exit_with_message(VCPKG_LINE_INFO,
-                                  "Environment variable VCPKG_FORCE_SYSTEM_BINARIES must be set on arm platform.");
+        Checks::exit_with_message(
+            VCPKG_LINE_INFO,
+            "Environment variable VCPKG_FORCE_SYSTEM_BINARIES must be set on arm and s390x platforms.");
     }
 #endif
 

diff --git a/toolsrc/src/vcpkg/triplet.cpp b/toolsrc/src/vcpkg/triplet.cpp
@@ -61,6 +61,10 @@ namespace vcpkg
         {
             return CPUArchitecture::ARM64;
         }
+        if (Strings::starts_with(this->canonical_name(), "s390x-"))
+        {
+            return CPUArchitecture::S390X;
+        }
 
         return nullopt;
     }
@@ -91,6 +95,8 @@ namespace vcpkg
                 return Triplet::from_canonical_name("arm64-linux");
 #elif defined(__arm__)
                 return Triplet::from_canonical_name("arm-linux");
+#elif defined(__s390x__)
+                return Triplet::from_canonical_name("s390x-linux");
 #else
                 return Triplet::from_canonical_name("x64-linux");
 #endif