target-mips: don't call cpu_loop_exit() from helper.c

[qemu.git] / Makefile.user

diff --git a/Makefile.user b/Makefile.user
index 907e74bd9eec7d7f395e0a67055e792c90988293..7daedeff6d89dc033caf491b3db47e03410838d2 100644 (file)
--- 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..