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

Fix building on OS X

Browse source
This commit is contained in:
Jeremy Soller 2016-10-15 20:56:03 -06:00
parent 884e18f370
commit 90d3a79fd9
1 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Makefile
View file

@ -91,11 +91,7 @@ $(KBUILD)/harddrive.bin: $(KBUILD)/kernel
qemu: $(KBUILD)/harddrive.bin qemu: $(KBUILD)/harddrive.bin
$(QEMU) $(QEMUFLAGS) -kernel $< $(QEMU) $(QEMUFLAGS) -kernel $<
else else
LD=ld
QEMUFLAGS+=-machine q35 -smp 4 -m 1024 QEMUFLAGS+=-machine q35 -smp 4 -m 1024
ifneq ($(kvm),no)
QEMUFLAGS+=-enable-kvm -cpu host
endif
ifeq ($(net),no) ifeq ($(net),no)
QEMUFLAGS+=-net none QEMUFLAGS+=-net none
else else
@ -114,7 +110,24 @@ else
UNAME := $(shell uname) UNAME := $(shell uname)
ifeq ($(UNAME),Darwin) ifeq ($(UNAME),Darwin)
CC=$(ARCH)-elf-gcc
CXX=$(ARCH)-elf-g++
ECHO=/bin/echo
LD=$(ARCH)-elf-ld LD=$(ARCH)-elf-ld
LDFLAGS=--gc-sections
KRUSTCFLAGS+=-C linker=$(CC)
KCARGOFLAGS+=-C linker=$(CC)
RUSTCFLAGS+=-C linker=$(CC)
CARGOFLAGS+=-C linker=$(CC)
else
CC=gcc
CXX=g++
ECHO=echo
LD=ld
LDFLAGS=--gc-sections
ifneq ($(kvm),no)
QEMUFLAGS+=-enable-kvm -cpu host
endif
endif endif
%.list: % %.list: %
@ -151,10 +164,10 @@ $(KBUILD)/libcollections.rlib: rust/src/libcollections/lib.rs $(KBUILD)/libcore.
$(KRUSTC) $(KRUSTCFLAGS) -o $@ $< $(KRUSTC) $(KRUSTCFLAGS) -o $@ $<
$(KBUILD)/libkernel.a: kernel/** $(KBUILD)/libcore.rlib $(KBUILD)/liballoc.rlib $(KBUILD)/libcollections.rlib $(BUILD)/initfs.rs $(KBUILD)/libkernel.a: kernel/** $(KBUILD)/libcore.rlib $(KBUILD)/liballoc.rlib $(KBUILD)/libcollections.rlib $(BUILD)/initfs.rs
$(KCARGO) rustc $(KCARGOFLAGS) -C opt-level=s -C lto -o $@ $(KCARGO) rustc $(KCARGOFLAGS) -C lto -o $@
$(KBUILD)/kernel: $(KBUILD)/libkernel.a $(KBUILD)/kernel: $(KBUILD)/libkernel.a
$(LD) --gc-sections -z max-page-size=0x1000 -T arch/$(ARCH)/src/linker.ld -o $@ $< $(LD) $(LDFLAGS) -z max-page-size=0x1000 -T arch/$(ARCH)/src/linker.ld -o $@ $<
# Userspace recipes # Userspace recipes
$(BUILD)/libcore.rlib: rust/src/libcore/lib.rs $(BUILD)/libcore.rlib: rust/src/libcore/lib.rs
@ -174,7 +187,7 @@ $(BUILD)/libcollections.rlib: rust/src/libcollections/lib.rs $(BUILD)/libcore.rl
$(RUSTC) $(RUSTCFLAGS) -o $@ $< $(RUSTC) $(RUSTCFLAGS) -o $@ $<
openlibm/libopenlibm.a: openlibm/libopenlibm.a:
CFLAGS=-fno-stack-protector make -C openlibm CC=$(CC) CFLAGS=-fno-stack-protector make -C openlibm
$(BUILD)/libopenlibm.a: openlibm/libopenlibm.a $(BUILD)/libopenlibm.a: openlibm/libopenlibm.a
mkdir -p $(BUILD) mkdir -p $(BUILD)
@ -213,7 +226,7 @@ $(BUILD)/initfs.rs: \
echo ' let mut files: BTreeMap<&'"'"'static [u8], (&'"'"'static [u8], bool)> = BTreeMap::new();' >> $@ echo ' let mut files: BTreeMap<&'"'"'static [u8], (&'"'"'static [u8], bool)> = BTreeMap::new();' >> $@
for folder in `find initfs -type d | sort`; do \ for folder in `find initfs -type d | sort`; do \
name=$$(echo $$folder | sed 's/initfs//' | cut -d '/' -f2-) ; \ name=$$(echo $$folder | sed 's/initfs//' | cut -d '/' -f2-) ; \
echo -n ' files.insert(b"'$$name'", (b"' >> $@ ; \ $(ECHO) -n ' files.insert(b"'$$name'", (b"' >> $@ ; \
ls -1 $$folder | sort | awk 'NR > 1 {printf("\\n")} {printf("%s", $$0)}' >> $@ ; \ ls -1 $$folder | sort | awk 'NR > 1 {printf("\\n")} {printf("%s", $$0)}' >> $@ ; \
echo '", true));' >> $@ ; \ echo '", true));' >> $@ ; \
done done