aboutsummaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in30
1 files changed, 4 insertions, 26 deletions
diff --git a/Makefile.in b/Makefile.in
index 331554d..37f1e98 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,40 +1,18 @@
.SILENT:
-
-###############################
-# Feature stuff
-###############################
-override SPECTRE_MITIGATION = @SPECTRE_MITIGATION@
-override SERIAL_DEBUG = @SERIAL_DEBUG@
-
-ifeq ($(SPECTRE_MITIGATION), 1)
- override SPECTRE_FLAGS=-D__SPECTRE_MITIGATION
-else
- override SPECTRE_FLAGS=
-endif
-
-ifeq ($(SERIAL_DEBUG), 1)
- override SERIAL_DEBUG_FLAGS=-D__SERIAL_DEBUG
-else
- override SERIAL_DEBUG_FLAGS=
-endif
-
-
###############################
# CFLAGS, QEMU flags + misc
###############################
override ARCH = @ARCH@
override HYRA_VERSION = @PACKAGE_VERSION@
override PROMPT := printf "%s\t\t%s\n"
-override KERNEL_DEFINES = -DHYRA_VERSION="\"$(HYRA_VERSION)\""\
- -DHYRA_BUILDDATE="\"@HYRA_BUILDDATE@\""\
- -DHYRA_BUILDBRANCH="\"@HYRA_BUILDBRANCH@\""\
- -DHYRA_ARCH="\"@ARCH@\""\
- $(SPECTRE_FLAGS)\
- $(SERIAL_DEBUG_FLAGS)
override KERNEL_CFLAGS = @KERNEL_CFLAGS@ $(KERNEL_DEFINES)
override KERNEL_LDFLAGS = -nostdlib -znoexecstack -zmax-page-size=0x1000 -static -Tconf/link-$(ARCH).ld
override QEMU_FLAGS = @QEMU_FLAGS@
+override KERNEL_DEFINES = $ -DHYRA_VERSION="\"$(HYRA_VERSION)\""\
+ -DHYRA_BUILDDATE="\"@HYRA_BUILDDATE@\""\
+ -DHYRA_BUILDBRANCH="\"@HYRA_BUILDBRANCH@\""\
+ -DHYRA_ARCH="\"@ARCH@\"" $(shell cat sys/arch/$(ARCH)/conf/GENERIC | tools/kconf/kconf)
######################
# Binutils stuff