From 76d4005f9e36fcb3b62b607353fd9baeae51232b Mon Sep 17 00:00:00 2001
From: Frans Kaashoek <kaashoek@mit.edu>
Date: Thu, 30 Aug 2018 14:09:03 -0400
Subject: thanks mtasm

---
 Makefile | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index d17f1fa..09d790c 100644
--- a/Makefile
+++ b/Makefile
@@ -82,6 +82,13 @@ ASFLAGS = -m32 -gdwarf-2 -Wa,-divide
 # FreeBSD ld wants ``elf_i386_fbsd''
 LDFLAGS += -m $(shell $(LD) -V | grep elf_i386 2>/dev/null | head -n 1)
 
+# Disable PIE when possible (for Ubuntu 16.10 toolchain)
+ifneq ($(shell $(CC) -dumpspecs 2>/dev/null | grep -e '[^f]no-pie'),)
+CFLAGS += -fno-pie -no-pie
+endif
+ifneq ($(shell $(CC) -dumpspecs 2>/dev/null | grep -e '[^f]nopie'),)
+CFLAGS += -fno-pie -nopie
+endif
 
 xv6.img: bootblock kernel
 	dd if=/dev/zero of=xv6.img count=10000
-- 
cgit v1.2.3