diff --git a/mk/prefix.mk b/mk/prefix.mk index 8ee01ea..9db8113 100644 --- a/mk/prefix.mk +++ b/mk/prefix.mk @@ -15,6 +15,8 @@ prefix-freestanding: $(PREFIX_FREESTANDING_INSTALL) prefix: $(PREFIX_INSTALL) +PREFIX_STRIP=find bin libexec "$(TARGET)/bin" -type f -exec strip {} ';' 2> /dev/null + $(PREFIX)/relibc-install: $(ROOT)/relibc | $(PREFIX)/gcc-install rm -rf "$@.partial" "$@" cp -r "$(PREFIX)/gcc-install" "$@.partial" @@ -23,7 +25,7 @@ $(PREFIX)/relibc-install: $(ROOT)/relibc | $(PREFIX)/gcc-install export CARGO=xargo && \ make -j `$(NPROC)` all && \ make -j `$(NPROC)` install DESTDIR="$(ROOT)/$@.partial/$(TARGET)" - find "$@.partial/bin" "$@.partial/lib" "$@.partial/libexec" -exec strip {} ';' 2> /dev/null + cd "$@.partial" && $(PREFIX_STRIP) touch "$@.partial" mv "$@.partial" "$@" @@ -76,7 +78,7 @@ $(PREFIX)/binutils-install: $(PREFIX)/binutils make -j `$(NPROC)` all && \ make -j `$(NPROC)` install DESTDIR="$(ROOT)/$@.partial" rm -rf "$<-build" - find "$@.partial/bin" "$@.partial/lib" "$@.partial/libexec" -exec strip {} ';' 2> /dev/null + cd "$@.partial" && $(PREFIX_STRIP) touch "$@.partial" mv "$@.partial" "$@" @@ -109,7 +111,7 @@ $(PREFIX)/gcc-freestanding-install: $(PREFIX)/gcc | $(PREFIX)/binutils-install make -j `$(NPROC)` all-gcc all-target-libgcc && \ make -j `$(NPROC)` install-gcc install-target-libgcc DESTDIR="$(ROOT)/$@.partial" rm -rf "$<-freestanding-build" - find "$@.partial/bin" "$@.partial/lib" "$@.partial/libexec" -exec strip {} ';' 2> /dev/null + cd "$@.partial" && $(PREFIX_STRIP) touch "$@.partial" mv "$@.partial" "$@" @@ -124,7 +126,7 @@ $(PREFIX)/rust-freestanding-install: $(ROOT)/rust | $(PREFIX)/gcc-freestanding-i make -j `$(NPROC)` install DESTDIR="$(ROOT)/$@.partial" rm -rf "$(PREFIX)/rust-freestanding-build" mkdir -p "$@.partial/lib/rustlib/x86_64-unknown-linux-gnu/bin" - find "$@.partial/bin" "$@.partial/lib" "$@.partial/libexec" -exec strip {} ';' 2> /dev/null + cd "$@.partial" && $(PREFIX_STRIP) touch "$@.partial" mv "$@.partial" "$@" @@ -137,7 +139,7 @@ $(PREFIX)/relibc-freestanding-install: $(ROOT)/relibc | $(PREFIX_FREESTANDING_IN export CARGO=xargo && \ make -j `$(NPROC)` all && \ make -j `$(NPROC)` install DESTDIR="$(ROOT)/$@.partial/$(TARGET)" - find "$@.partial/bin" "$@.partial/lib" "$@.partial/libexec" -exec strip {} ';' 2> /dev/null + cd "$@.partial" && $(PREFIX_STRIP) touch "$@.partial" mv "$@.partial" "$@" @@ -162,7 +164,7 @@ $(PREFIX)/gcc-install: $(PREFIX)/gcc | $(PREFIX)/relibc-freestanding-install make -j `$(NPROC)` all-gcc all-target-libgcc all-target-libstdc++-v3 && \ make -j `$(NPROC)` install-gcc install-target-libgcc install-target-libstdc++-v3 DESTDIR="$(ROOT)/$@.partial" rm -rf "$<-build" - find "$@.partial/bin" "$@.partial/lib" "$@.partial/libexec" -exec strip {} ';' 2> /dev/null + cd "$@.partial" && $(PREFIX_STRIP) touch "$@.partial" mv "$@.partial" "$@"