aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.user
diff options
context:
space:
mode:
authorKirill A. Shutemov <kirill@shutemov.name>2009-12-19 15:16:08 +0000
committerBlue Swirl <blauwirbel@gmail.com>2009-12-19 15:16:08 +0000
commit299060a06e7c73de5cb9962edbca7f7f9e0b7f25 (patch)
tree22ef049cb04152984b7579e8f8f4aa59ddf0530e /Makefile.user
parent060fbfe1d607abd6cf58edbf13d10103b0c6738e (diff)
user_only: compile everything with -fpie
We really need compile _all_ sources for user target with -fpie when use --enable-user-pie. It's regression introduced by commit add16157d72454. Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name> Cc: Blue Swirl <blauwirbel@gmail.com> Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'Makefile.user')
-rw-r--r--Makefile.user7
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.user b/Makefile.user
index 907e74bd9..9e4f040e7 100644
--- a/Makefile.user
+++ b/Makefile.user
@@ -2,10 +2,15 @@
include ../config-host.mak
include $(SRC_PATH)/rules.mak
+include config.mak
.PHONY: all
-VPATH=$(SRC_PATH)
+# Do not take %.o from $(SRC_PATH), only %.c and %.h
+# All %.o for user targets should be built with -fpie, when
+# configured with --enable-user-pie, so we don't want to
+# take %.o from $(SRC_PATH), since they built without -fpie
+vpath %.c %.h $(SRC_PATH)
QEMU_CFLAGS+=-I..