From 24f6d59354df69788c96f26e8c046a50c383c886 Mon Sep 17 00:00:00 2001 From: Sam Bingner Date: Fri, 12 Oct 2018 16:47:06 -1000 Subject: Build environment changes --- helper.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'helper.sh') diff --git a/helper.sh b/helper.sh index 0c98e39f5..f67ea5168 100755 --- a/helper.sh +++ b/helper.sh @@ -2,7 +2,7 @@ source "${PKG_BASE}/architect.sh" -export PKG_ROOT=$("${PKG_TARG}-gcc" -dumpspecs | grep '%{isysroot' | sed -e 's/.*%{isysroot\*:\([^}]*\)}.*/\1/; s/;:/\n/g' | sed -e 's/^-syslibroot //' | tail -n 1) +export PKG_ROOT=$(xcrun -sdk iphoneos --show-sdk-path) export PKG_CCPF=$("${PKG_TARG}-gcc" -v 2>&1 | grep -- --prefix | sed -e 's/.*--prefix=\([^ ]*\).*/\1/') source "${PKG_BASE}/folders.sh" @@ -13,7 +13,7 @@ if [[ ${PKG_NAME} != @(-|:*) ]]; then export PKG_WORK=$(PKG_WORK_ "${PKG_NAME}") export PKG_DEST=$(PKG_DEST_ "${PKG_NAME}") - export PKG_STAT=${PKG_BASE}/stat/${PKG_ARCH}/${PKG_NAME} + export PKG_STAT=${PKG_BASE}/stat/${PKG_ARCH}/${PKG_CFTARG}/${PKG_NAME} export PKG_DATA=$(echo "${PKG_BASE}"/data/"${PKG_NAME}"?(_)) export PKG_RVSN=$(cat "${PKG_STAT}/dest-ver" 2>/dev/null) -- cgit v1.2.3