From 4a5ce3165dcd0769c55a53151c145a3d3df9d9ef Mon Sep 17 00:00:00 2001
From: paercebal <paercebal@gmail.com>
Date: Fri, 28 Jul 2017 12:57:05 +0200
Subject: fix the TRIPLET_SYSTEM_ARCH initialization

---
 scripts/ports.cmake | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/ports.cmake b/scripts/ports.cmake
index 1d699a966..8b4d17d80 100644
--- a/scripts/ports.cmake
+++ b/scripts/ports.cmake
@@ -32,8 +32,6 @@ endif()
 
 
 if(CMD MATCHES "^BUILD$")
-    string(REGEX REPLACE "([^-]*)-([^-]*)" "\\1" TRIPLET_SYSTEM_ARCH ${TARGET_TRIPLET})
-
     set(CMAKE_TRIPLET_FILE ${VCPKG_ROOT_DIR}/triplets/${TARGET_TRIPLET}.cmake)
     if(NOT EXISTS ${CMAKE_TRIPLET_FILE})
         message(FATAL_ERROR "Unsupported target triplet. Triplet file does not exist: ${CMAKE_TRIPLET_FILE}")
@@ -70,6 +68,7 @@ if(CMD MATCHES "^BUILD$")
     file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR} ${CURRENT_PACKAGES_DIR})
 
     include(${CMAKE_TRIPLET_FILE})
+    set(TRIPLET_SYSTEM_ARCH ${VCPKG_TARGET_ARCHITECTURE})
     include(${CURRENT_PORT_DIR}/portfile.cmake)
 
     set(BUILD_INFO_FILE_PATH ${CURRENT_PACKAGES_DIR}/BUILD_INFO)
-- 
cgit v1.2.3