diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2018-03-28 22:23:38 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2018-03-28 22:23:38 +0000 |
| commit | b12dde7b084f08e05285448c652ff288ec690618 (patch) | |
| tree | 5d65efb1cd27af36d6b72310fb7f7363eb3966e5 | |
| parent | 56e81eeb10899e01a6af901ae84adc0025e22abd (diff) | |
| download | lh-bootstrap-b12dde7b084f08e05285448c652ff288ec690618.tar.xz | |
make gcc link as normal user, remove unused sub/musl files
| -rw-r--r-- | sub/musl/Makefile | 2 | ||||
| -rw-r--r-- | sub/musl/libssp_nonshared.c | 6 | ||||
| -rwxr-xr-x | sub/musl/muslgccmake | 18 |
3 files changed, 1 insertions, 25 deletions
diff --git a/sub/musl/Makefile b/sub/musl/Makefile index 797d37d..01953f1 100644 --- a/sub/musl/Makefile +++ b/sub/musl/Makefile @@ -14,7 +14,7 @@ $(OUTPUT)/build-build/.lh_gcc: $(OUTPUT)/build-build/bin/gcc exec setuidgid $(NORMALUSER) touch $@ $(OUTPUT)/build-build/bin/gcc: | $(OUTPUT)/tmp/.lh_prepared - ln -sf $(BUILD_BUILD_CC) $(OUTPUT)/build-build/bin/gcc + exec setuidgid $(NORMALUSER) ln -sf $(BUILD_BUILD_CC) $(OUTPUT)/build-build/bin/gcc # Build-host diff --git a/sub/musl/libssp_nonshared.c b/sub/musl/libssp_nonshared.c deleted file mode 100644 index 3ad0599..0000000 --- a/sub/musl/libssp_nonshared.c +++ /dev/null @@ -1,6 +0,0 @@ -extern void __stack_chk_fail (void) ; - -void __attribute__((visibility ("hidden"))) __stack_chk_fail_local (void) -{ - __stack_chk_fail() ; -} diff --git a/sub/musl/muslgccmake b/sub/musl/muslgccmake deleted file mode 100755 index 6618bb9..0000000 --- a/sub/musl/muslgccmake +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -e - -file="$1" -muslspecs="$2" -realgcc="$3" -allstatic="$4" - -if $allstatic ; then - dostatic=-static -else - dostatic= -fi - -cat > "$file" <<EOF -#!/bin/sh -exec "\${REALGCC:-$realgcc}" $dostatic -specs "$muslspecs" "\$@" -EOF -exec chmod 0755 "$file" |