summaryrefslogtreecommitdiff
path: root/rules.mak
diff options
context:
space:
mode:
authorRichard Henderson <rth@twiddle.net>2016-07-07 21:49:36 -0700
committerRichard Henderson <rth@twiddle.net>2016-07-10 10:05:46 -0700
commitcdbd727c20ad7aac7797dc8c95e485e1a4c6901b (patch)
tree31cfc311911c1ba23ce44fde29aa68445b7fd75b /rules.mak
parent4aa3f4dd5bb9c2282627bf99d85eff61b325beb0 (diff)
downloadqemu-cdbd727c20ad7aac7797dc8c95e485e1a4c6901b.tar.gz
qemu-cdbd727c20ad7aac7797dc8c95e485e1a4c6901b.tar.bz2
qemu-cdbd727c20ad7aac7797dc8c95e485e1a4c6901b.zip
build: Use $(AS) for optionrom explicitly
For clang before 3.5, -fno-integrated-as does not exist, so the workaround in 5f6f0e27fb24 fails to build. Use clang's default assembler for linux-user/safe-syscall.S, and explicitly change to use the system assembler for the option roms. Tested-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Signed-off-by: Richard Henderson <rth@twiddle.net>
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 7d7d83b124..ed8e482780 100644
--- a/rules.mak
+++ b/rules.mak
@@ -69,7 +69,7 @@ LINK = $(call quiet-command, $(LINKPROG) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o
$(version-obj-y) $(call extract-libs,$1) $(LIBS)," LINK $(TARGET_DIR)$@")
%.o: %.S
- $(call quiet-command,$(CCAS) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," AS $(TARGET_DIR)$@")
+ $(call quiet-command,$(CCAS) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," CCAS $(TARGET_DIR)$@")
%.o: %.cc
$(call quiet-command,$(CXX) $(QEMU_INCLUDES) $(QEMU_CXXFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) $($@-cflags) -c -o $@ $<," CXX $(TARGET_DIR)$@")