diff options
| author | Adrian Bunk | 2016-11-27 17:28:17 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2016-11-28 16:45:12 +0100 |
| commit | c96f0ee6a67ca6277366e78ce5d84d5c20dd596f (patch) | |
| tree | 929e05efe6b40fd9dcf5bb256d3a67f4ed03c167 | |
| parent | migration/pcspk: Turn migration of pcspk off for 2.7 and older (diff) | |
| download | qemu-c96f0ee6a67ca6277366e78ce5d84d5c20dd596f.tar.gz qemu-c96f0ee6a67ca6277366e78ce5d84d5c20dd596f.tar.xz qemu-c96f0ee6a67ca6277366e78ce5d84d5c20dd596f.zip | |
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>
| -rw-r--r-- | rules.mak | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -93,7 +93,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","$(TARGET_DIR)$@") |