diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2020-01-29 17:53:09 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2020-01-29 17:53:09 +0000 |
| commit | 99aaeae7550e879973cb175ab82f65353c31ee02 (patch) | |
| tree | 5e9c517d6b04b6620e3ee8d3c278367e3dda391b /make | |
| parent | 3340b5a93638ac45a63dc8454d3eb29e254794f9 (diff) | |
| download | lh-bootstrap-99aaeae7550e879973cb175ab82f65353c31ee02.tar.xz | |
Small incremental build fixes (41)
Diffstat (limited to 'make')
| -rwxr-xr-x | make | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -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" \ |