aarch64: Fix wrong cmake.conf values caused by TARGET_PREFIX when

building just linux and starting a regular build later.
LibreELEC · Oct 16, 2017 · be9aa11 · be9aa11
1 parent 2c3ae36
commit be9aa11
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/packages/linux/package.mk b/packages/linux/package.mk
@@ -76,7 +76,6 @@ esac
 if [ "$TARGET_KERNEL_ARCH" = "arm64" -a "$TARGET_ARCH" = "arm" ]; then
   PKG_DEPENDS_HOST="$PKG_DEPENDS_HOST gcc-linaro-aarch64-linux-gnu:host"
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET gcc-linaro-aarch64-linux-gnu:host"
-  TARGET_PREFIX=$TOOLCHAIN/lib/gcc-linaro-aarch64-linux-gnu/bin/aarch64-linux-gnu-
   HEADERS_ARCH=$TARGET_ARCH
 fi
 

diff --git a/scripts/unpack b/scripts/unpack
@@ -73,6 +73,12 @@ if [ -d "$SOURCES/$1" -o -d "$PKG_DIR/sources" ]; then
 
   . $PKG_DIR/package.mk
 
+  if [ "$PKG_IS_KERNEL_PKG" = "yes" ]; then
+    if [ "$TARGET_KERNEL_ARCH" = "arm64" -a "$TARGET_ARCH" = "arm" ]; then
+      TARGET_PREFIX=$TOOLCHAIN/lib/gcc-linaro-aarch64-linux-gnu/bin/aarch64-linux-gnu-
+    fi
+  fi
+
   if [ "$(type -t pre_unpack)" = "function" ]; then
     pre_unpack
   fi