diff options
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index df99dc0..8b098c6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -33,14 +33,19 @@ override KERNEL_DEFINES = -DHYRA_VERSION="\"$(HYRA_VERSION)\""\ $(SPECTRE_FLAGS)\ $(SERIAL_DEBUG_FLAGS) override KERNEL_CFLAGS = @KERNEL_CFLAGS@ $(KERNEL_DEFINES) -override KERNEL_LDFLAGS = -nostdlib -zmax-page-size=0x1000 -static -Tconf/link-$(ARCH).ld +override KERNEL_LDFLAGS = -nostdlib -znoexecstack -zmax-page-size=0x1000 -static -Tconf/link-$(ARCH).ld override QEMU_FLAGS = @QEMU_FLAGS@ ###################### # Binutils stuff ###################### -override CC = $(shell pwd)/cross/bin/$(ARCH)-elf-gcc -override LD = $(shell pwd)/cross/bin/$(ARCH)-elf-ld +ifeq ($(ARCH), amd64) + override CC = $(shell pwd)/cross/bin/x86_64-hyra-gcc + override LD = $(shell pwd)/cross/bin/x86_64-hyra-ld +else + override CC = $(shell pwd)/cross/bin/$(ARCH)-hyra-gcc + override LD = $(shell pwd)/cross/bin/$(ARCH)-hyra-ld +endif override AS = $(CC) ########################## |