vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix strip command on OS X

Browse source
This commit is contained in:
Jeremy Soller 2017-01-02 16:31:54 -07:00
parent cfec167ab6
commit a1f0e0e547
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Makefile
View file

@ -219,6 +219,7 @@ else
FUMOUNT=sudo umount FUMOUNT=sudo umount
export LD=$(ARCH)-elf-ld export LD=$(ARCH)-elf-ld
export LDFLAGS=--gc-sections export LDFLAGS=--gc-sections
export STRIP=$(ARCH)-elf-strip
VB_AUDIO=coreaudio VB_AUDIO=coreaudio
VBM="/Applications/VirtualBox.app/Contents/MacOS/VBoxManage" VBM="/Applications/VirtualBox.app/Contents/MacOS/VBoxManage"
else else
@ -227,6 +228,7 @@ else
FUMOUNT=fusermount -u FUMOUNT=fusermount -u
export LD=ld export LD=ld
export LDFLAGS=--gc-sections export LDFLAGS=--gc-sections
export STRIP=strip
ifneq ($(kvm),no) ifneq ($(kvm),no)
QEMUFLAGS+=-enable-kvm -cpu host QEMUFLAGS+=-enable-kvm -cpu host
endif endif
@ -368,17 +370,17 @@ $(BUILD)/libstd.rlib: rust/src/libstd/Cargo.toml rust/src/libstd/**
initfs/bin/%: drivers/%/Cargo.toml drivers/%/src/** $(BUILD)/libstd.rlib initfs/bin/%: drivers/%/Cargo.toml drivers/%/src/** $(BUILD)/libstd.rlib
mkdir -p initfs/bin mkdir -p initfs/bin
$(CARGO) rustc --manifest-path $< $(CARGOFLAGS) -o $@ $(CARGO) rustc --manifest-path $< $(CARGOFLAGS) -o $@
strip $@ $(STRIP) $@
initfs/bin/%: programs/%/Cargo.toml programs/%/src/** $(BUILD)/libstd.rlib initfs/bin/%: programs/%/Cargo.toml programs/%/src/** $(BUILD)/libstd.rlib
mkdir -p initfs/bin mkdir -p initfs/bin
$(CARGO) rustc --manifest-path $< $(CARGOFLAGS) -o $@ $(CARGO) rustc --manifest-path $< $(CARGOFLAGS) -o $@
strip $@ $(STRIP) $@
initfs/bin/%: schemes/%/Cargo.toml schemes/%/src/** $(BUILD)/libstd.rlib initfs/bin/%: schemes/%/Cargo.toml schemes/%/src/** $(BUILD)/libstd.rlib
mkdir -p initfs/bin mkdir -p initfs/bin
$(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@ $(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@
strip $@ $(STRIP) $@
$(BUILD)/initfs.rs: \ $(BUILD)/initfs.rs: \
initfs/bin/init \ initfs/bin/init \
@ -405,12 +407,12 @@ $(BUILD)/initfs.rs: \
filesystem/sbin/%: drivers/%/Cargo.toml drivers/%/src/** $(BUILD)/libstd.rlib filesystem/sbin/%: drivers/%/Cargo.toml drivers/%/src/** $(BUILD)/libstd.rlib
mkdir -p filesystem/sbin mkdir -p filesystem/sbin
$(CARGO) rustc --manifest-path $< $(CARGOFLAGS) -o $@ $(CARGO) rustc --manifest-path $< $(CARGOFLAGS) -o $@
strip $@ $(STRIP) $@
filesystem/bin/%: programs/%/Cargo.toml programs/%/src/** $(BUILD)/libstd.rlib filesystem/bin/%: programs/%/Cargo.toml programs/%/src/** $(BUILD)/libstd.rlib
mkdir -p filesystem/bin mkdir -p filesystem/bin
$(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@ $(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@
strip $@ $(STRIP) $@
filesystem/bin/sh: filesystem/bin/ion filesystem/bin/sh: filesystem/bin/ion
cp $< $@ cp $< $@
@ -418,52 +420,52 @@ filesystem/bin/sh: filesystem/bin/ion
filesystem/bin/%: programs/binutils/Cargo.toml programs/binutils/src/bin/%.rs $(BUILD)/libstd.rlib filesystem/bin/%: programs/binutils/Cargo.toml programs/binutils/src/bin/%.rs $(BUILD)/libstd.rlib
mkdir -p filesystem/bin mkdir -p filesystem/bin
$(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@ $(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@
strip $@ $(STRIP) $@
filesystem/bin/%: programs/coreutils/Cargo.toml programs/coreutils/src/bin/%.rs $(BUILD)/libstd.rlib filesystem/bin/%: programs/coreutils/Cargo.toml programs/coreutils/src/bin/%.rs $(BUILD)/libstd.rlib
mkdir -p filesystem/bin mkdir -p filesystem/bin
$(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@ $(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@
strip $@ $(STRIP) $@
filesystem/bin/%: programs/extrautils/Cargo.toml programs/extrautils/src/bin/%.rs $(BUILD)/libstd.rlib filesystem/bin/%: programs/extrautils/Cargo.toml programs/extrautils/src/bin/%.rs $(BUILD)/libstd.rlib
mkdir -p filesystem/bin mkdir -p filesystem/bin
$(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@ $(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@
strip $@ $(STRIP) $@
filesystem/bin/%: programs/games/Cargo.toml programs/games/src/%/**.rs $(BUILD)/libstd.rlib filesystem/bin/%: programs/games/Cargo.toml programs/games/src/%/**.rs $(BUILD)/libstd.rlib
mkdir -p filesystem/bin mkdir -p filesystem/bin
$(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@ $(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@
strip $@ $(STRIP) $@
filesystem/bin/%: programs/netutils/Cargo.toml programs/netutils/src/%/**.rs $(BUILD)/libstd.rlib filesystem/bin/%: programs/netutils/Cargo.toml programs/netutils/src/%/**.rs $(BUILD)/libstd.rlib
mkdir -p filesystem/bin mkdir -p filesystem/bin
$(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@ $(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@
strip $@ $(STRIP) $@
filesystem/ui/bin/%: programs/orbutils/Cargo.toml programs/orbutils/src/%/**.rs $(BUILD)/libstd.rlib filesystem/ui/bin/%: programs/orbutils/Cargo.toml programs/orbutils/src/%/**.rs $(BUILD)/libstd.rlib
mkdir -p filesystem/ui/bin mkdir -p filesystem/ui/bin
$(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@ $(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@
strip $@ $(STRIP) $@
filesystem/bin/%: programs/pkgutils/Cargo.toml programs/pkgutils/src/%/**.rs $(BUILD)/libstd.rlib filesystem/bin/%: programs/pkgutils/Cargo.toml programs/pkgutils/src/%/**.rs $(BUILD)/libstd.rlib
mkdir -p filesystem/bin mkdir -p filesystem/bin
$(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@ $(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@
strip $@ $(STRIP) $@
filesystem/bin/%: programs/userutils/Cargo.toml programs/userutils/src/bin/%.rs $(BUILD)/libstd.rlib filesystem/bin/%: programs/userutils/Cargo.toml programs/userutils/src/bin/%.rs $(BUILD)/libstd.rlib
mkdir -p filesystem/bin mkdir -p filesystem/bin
$(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@ $(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@
strip $@ $(STRIP) $@
filesystem/sbin/%: schemes/%/Cargo.toml schemes/%/src/** $(BUILD)/libstd.rlib filesystem/sbin/%: schemes/%/Cargo.toml schemes/%/src/** $(BUILD)/libstd.rlib
mkdir -p filesystem/sbin mkdir -p filesystem/sbin
$(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@ $(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@
strip $@ $(STRIP) $@
filesystem/sbin/redoxfs-mkfs: schemes/redoxfs/Cargo.toml schemes/redoxfs/src/** $(BUILD)/libstd.rlib filesystem/sbin/redoxfs-mkfs: schemes/redoxfs/Cargo.toml schemes/redoxfs/src/** $(BUILD)/libstd.rlib
mkdir -p filesystem/bin mkdir -p filesystem/bin
$(CARGO) rustc --manifest-path $< --bin redoxfs-mkfs $(CARGOFLAGS) -o $@ $(CARGO) rustc --manifest-path $< --bin redoxfs-mkfs $(CARGOFLAGS) -o $@
strip $@ $(STRIP) $@
drivers: \ drivers: \
filesystem/sbin/pcid \ filesystem/sbin/pcid \