aboutsummaryrefslogtreecommitdiffstats
path: root/src/Make.config
diff options
context:
space:
mode:
authorklaar36 <klas.arvidsson@liu.se>2018-04-18 17:15:50 +0200
committerklaar36 <klas.arvidsson@liu.se>2018-04-18 17:15:50 +0200
commitf3e1dd764327c4d5361880c546bfa76baa97d32e (patch)
tree1d275880b18ac812abc3bd15d7b650e092c5eef4 /src/Make.config
parent4509fc2711408cc7f94fd466fee01b9ed5ec25bc (diff)
parentfaedf3ab0659cff849034d85d7c58551afb2d5eb (diff)
downloadpintos-rs-f3e1dd764327c4d5361880c546bfa76baa97d32e.tar.gz
Merge branch 'new-gcc-qemu-fix' into 'master'
Fixed compilation issues on the latest GCC and QEMU. See merge request !10
Diffstat (limited to 'src/Make.config')
-rw-r--r--src/Make.config2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Make.config b/src/Make.config
index 69914d8..f6e3ccf 100644
--- a/src/Make.config
+++ b/src/Make.config
@@ -48,7 +48,7 @@ WARNINGS = -Wall -W -Wstrict-prototypes -Wmissing-prototypes -Wsystem-headers
# klaar36@ida 2015-03: -fno-omit-frame-pointer to get working backtrace
# klaar36@ida 2016-05: -ffreestanding to assert freestanding environment
# klaar36@ida 2016-05: -fno-inline to ease debugging
-CFLAGS = -std=gnu99 -ggdb -msoft-float -fno-omit-frame-pointer -ffreestanding -fno-inline -O $(CFLAG_STACK_PROTECTOR)
+CFLAGS = -std=gnu99 -ggdb -msoft-float -fno-omit-frame-pointer -ffreestanding -fno-inline -fno-pic -O $(CFLAG_STACK_PROTECTOR)
CPPFLAGS = -nostdinc -I$(SRCDIR) -I$(SRCDIR)/lib
ASFLAGS = -Wa,--gstabs
LDFLAGS =