From 99aaeae7550e879973cb175ab82f65353c31ee02 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Wed, 29 Jan 2020 17:53:09 +0000
Subject:  Small incremental build fixes (41)

---
 make | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'make')

diff --git a/make b/make
index 965caa3..9aef9bb 100755
--- a/make
+++ b/make
@@ -22,7 +22,7 @@ BUILD_HOST_CC="$TRIPLE-${CROSS_CC:-gcc}"
 ROOTFS_SIZE=${ROOTFS_SIZE:-1024M}
 RWFS_SIZE=${RWFS_SIZE:-512M}
 USERFS_SIZE=${USERFS_SIZE:-512M}
-
+LIBC_SYSROOT=${LIBC_SYSROOT:-$(${BUILD_HOST_CC} -print-sysroot)}
 
 if test -z "$BUILD_HOST_STATIC" ; then
   case "$TRIPLE" in
@@ -31,6 +31,13 @@ if test -z "$BUILD_HOST_STATIC" ; then
   esac
 fi
 
+if test -z "$LIBC_COPY" ; then
+  case "$BUILD_HOST_STATIC" in
+    true) LIBC_COPY=false ;;
+    *) LIBC_COPY=true ;;
+  esac
+fi
+
 if test -n "$CROSS_BASE" ; then
   crossenv=""
 else
@@ -57,7 +64,8 @@ PATH="$WD/bin:$OUTPUT/build-build/command:$OUTPUT/build-build/bin:$OUTPUT/build-
 
 umask 022
 exec env -i $crossenv LH_MAKE_MARKER=1 "WD=$WD" "NORMALUSER=$NORMALUSER" "TRIPLE=$TRIPLE" "OUTPUT=$OUTPUT" "PATH=$PATH" \
-  "ROOTFS_SIZE=$ROOTFS_SIZE" "RWFS_SIZE=$RWFS_SIZE" "USERFS_SIZE=$USERFS_SIZE" BUILD_HOST_STATIC="$BUILD_HOST_STATIC" \
+  "ROOTFS_SIZE=$ROOTFS_SIZE" "RWFS_SIZE=$RWFS_SIZE" "USERFS_SIZE=$USERFS_SIZE" \
+  "BUILD_HOST_STATIC=$BUILD_HOST_STATIC" "LIBC_SYSROOT=$LIBC_SYSROOT" "LIBC_COPY=$LIBC_COPY" \
   "BUILD_HOST_CC=$BUILD_HOST_CC" "BUILD_HOST_CC_FULL=$BUILD_HOST_CC_FULL" "BUILD_HOST_SYSROOT=$BUILD_HOST_SYSROOT" "BUILD_HOST_PREFIX=$BUILD_HOST_PREFIX" \
   "KERNEL_ARCH=$KERNEL_ARCH" "KERNEL_GENERIC_ARCH=$KERNEL_GENERIC_ARCH" "QEMU_ARCH=$QEMU_ARCH" "KERNEL_CONFIG=$KERNEL_CONFIG" \
   "BUILD_BUILD_CC=$BUILD_BUILD_CC" SHELL=/bin/sh "CONSOLE=$CONSOLE" \
-- 
cgit v1.2.3