summaryrefslogtreecommitdiff
path: root/rules.mak
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2016-11-27 18:28:17 +0200
committerMichael Roth <mdroth@linux.vnet.ibm.com>2016-12-12 18:05:55 -0600
commit248a780fd31ca218d2652c8a4ca19ca8abefb472 (patch)
tree991f1d0777a38ad497718dc17872b3ddfb68839e /rules.mak
parent80f630be2105a6957c8125b789e04573064438d2 (diff)
downloadqemu-248a780fd31ca218d2652c8a4ca19ca8abefb472.tar.gz
rules.mak: Use -r instead of -Wl, -r to fix building when PIE is default
Building qemu fails in distributions where gcc enables PIE by default (e.g. Debian unstable) with: /usr/bin/ld: -r and -pie may not be used together Use -r instead of -Wl,-r to avoid gcc passing -pie to the linker when PIE is enabled and a relocatable object is passed. Signed-off-by: Adrian Bunk <bunk@stusta.de> Message-Id: <20161127162817.15144-1-bunk@stusta.de> Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> (cherry picked from commit c96f0ee6a67ca6277366e78ce5d84d5c20dd596f) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Diffstat (limited to 'rules.mak')
-rw-r--r--rules.mak2
1 files changed, 1 insertions, 1 deletions
diff --git a/rules.mak b/rules.mak
index 99cd0b3371..97f1aa1677 100644
--- a/rules.mak
+++ b/rules.mak
@@ -92,7 +92,7 @@ module-common.o: CFLAGS += $(DSO_OBJ_CFLAGS)
$(if $(findstring /,$@),$(call quiet-command,cp $@ $(subst /,-,$@), " CP $(subst /,-,$@)"))
-LD_REL := $(CC) -nostdlib -Wl,-r $(LD_REL_FLAGS)
+LD_REL := $(CC) -nostdlib -r $(LD_REL_FLAGS)
%.mo:
$(call quiet-command,$(LD_REL) -o $@ $^," LD -r $(TARGET_DIR)$@")