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 /sub | |
| parent | 3340b5a93638ac45a63dc8454d3eb29e254794f9 (diff) | |
| download | lh-bootstrap-99aaeae7550e879973cb175ab82f65353c31ee02.tar.xz | |
Small incremental build fixes (41)
Diffstat (limited to 'sub')
| -rwxr-xr-x | sub/layout/copylayout | 11 | ||||
| -rw-r--r-- | sub/skarnet.org/Makefile | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/sub/layout/copylayout b/sub/layout/copylayout index 01e1574..91f901f 100755 --- a/sub/layout/copylayout +++ b/sub/layout/copylayout @@ -3,12 +3,12 @@ output="$1" s6-hiercopy layout/rootfs $output/rootfs -chown -R 0:0 $output/rootfs $output/rwfs $output/userfs find "$output/rootfs" -type f -name .empty -size 0c -exec s6-rmrf {} \; s6-hiercopy layout/rwfs $output/rwfs find "$output/rwfs" -type f -name .empty -size 0c -exec s6-rmrf {} \; s6-hiercopy layout/userfs $output/userfs find "$output/userfs" -type f -name .empty -size 0c -exec s6-rmrf {} \; +chown -R 0:0 $output/rootfs $output/rwfs $output/userfs buildtime=$(s6-clock) @@ -24,13 +24,12 @@ done < sub/layout/permissions # If dynamic: copy shared libs from the toolchain into the target -if ! ${BUILD_HOST_STATIC} ; then - sysroot=`${BUILD_HOST_CC} -print-sysroot` +if ${LIBC_COPY} ; then for lib in lib lib32 lib64 ; do - if s6-test -d "$sysroot/$lib" ; then + if s6-test -d "$LIBC_SYSROOT/$lib" ; then s6-mkdir -p "$output/rootfs/$lib" - for i in `ls -1 "$sysroot/$lib" | grep -e '\.so$' -e '\.so\.'` ; do - s6-hiercopy "$sysroot/$lib/$i" "$output/rootfs/$lib/$i" + for i in `ls -1 "$LIBC_SYSROOT/$lib" | grep -e '\.so$' -e '\.so\.'` ; do + s6-hiercopy "$LIBC_SYSROOT/$lib/$i" "$output/rootfs/$lib/$i" done fi done diff --git a/sub/skarnet.org/Makefile b/sub/skarnet.org/Makefile index 1e44fe0..fa67b31 100644 --- a/sub/skarnet.org/Makefile +++ b/sub/skarnet.org/Makefile @@ -16,7 +16,7 @@ S6_LINUX_INIT_VERSION := 6a1207350d876659296c6aab7cd1063bbb3d0ed1 MDEVD_VERSION := 7430c9be1d379ae1eb0626ec67968b6edcfbf7d6 BCNM_VERSION := fe28e76256c4ff7d1af53ad3940bf737f6000107 -SKARNET_CONF_STATIC := $(if $(filter true,$(BUILD_HOST_STATIC)),--enable-static-libc,--enable-shared --disable-allstatic) +SKARNET_CONF_STATIC := $(if $(filter true,$(BUILD_HOST_STATIC)),--disable-shared --enable-static-libc,--enable-shared --disable-allstatic) SKALIBS_FIND_OPTIONS := --with-sysdeps=$(OUTPUT)/rootfs/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/rootfs/package/prog/skalibs/include --with-lib=$(OUTPUT)/rootfs/package/prog/skalibs/library --with-dynlib=$(OUTPUT)/rootfs/package/prog/skalibs/library.so EXECLINE_FIND_OPTIONS := --with-include=$(OUTPUT)/rootfs/package/admin/execline/include --with-lib=$(OUTPUT)/rootfs/package/admin/execline/library --with-dynlib=$(OUTPUT)/rootfs/package/admin/execline/library.so S6_FIND_OPTIONS := --with-include=$(OUTPUT)/rootfs/package/admin/s6/include --with-lib=$(OUTPUT)/rootfs/package/admin/s6/library --with-dynlib=$(OUTPUT)/rootfs/package/admin/s6/library.so |