Skip to content

Commit

Permalink
aarch64: Fix wrong cmake.conf values caused by TARGET_PREFIX when
Browse files Browse the repository at this point in the history
building just linux and starting a regular build later.
  • Loading branch information
Radostan Riedel committed Oct 20, 2017
1 parent 2c3ae36 commit 66b316e
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions packages/linux/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,10 @@ 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-
PKG_TARGET_PREFIX=$TOOLCHAIN/lib/gcc-linaro-aarch64-linux-gnu/bin/aarch64-linux-gnu-
HEADERS_ARCH=$TARGET_ARCH
else
PKG_TARGET_PREFIX=$TARGET_PREFIX
fi

PKG_MAKE_OPTS_HOST="ARCH=${HEADERS_ARCH:-$TARGET_KERNEL_ARCH} headers_check"
Expand Down Expand Up @@ -115,7 +117,7 @@ post_patch() {
sed -i -e "s|^HOSTCC[[:space:]]*=.*$|HOSTCC = $TOOLCHAIN/bin/host-gcc|" \
-e "s|^HOSTCXX[[:space:]]*=.*$|HOSTCXX = $TOOLCHAIN/bin/host-g++|" \
-e "s|^ARCH[[:space:]]*?=.*$|ARCH = $TARGET_KERNEL_ARCH|" \
-e "s|^CROSS_COMPILE[[:space:]]*?=.*$|CROSS_COMPILE = $TARGET_PREFIX|" \
-e "s|^CROSS_COMPILE[[:space:]]*?=.*$|CROSS_COMPILE = $PKG_TARGET_PREFIX|" \
$PKG_BUILD/Makefile

cp $KERNEL_CFG_FILE $PKG_BUILD/.config
Expand Down

0 comments on commit 66b316e

Please sign in to comment.