diff options
Diffstat (limited to 'Makerules')
-rw-r--r-- | Makerules | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Makerules b/Makerules index 35147191e7..9db5fb55c0 100644 --- a/Makerules +++ b/Makerules @@ -225,6 +225,11 @@ sed-remove-dotdot := -e 's@ *\([^ \/$$][^ \]*\)@ $$(..)\1@g' \ -e 's@^\([^ \/$$][^ \]*\)@$$(..)\1@g' endif +MOARFLAGS = +ifeq ($(with-clang),yes) +MOARFLAGS = -no-integrated-as +endif + ifdef gen-py-const-headers # We'll use a static pattern rule to match .pysym files with their # corresponding generated .py files. @@ -260,7 +265,7 @@ $(py-const): $(py-const-dir)%.py: %.pysym $(py-const-script) \ $(common-before-compile) $(make-target-directory) $(AWK) -f $(py-const-script) $< \ - | $(CC) -S -o $@.tmp $(CFLAGS) $(CPPFLAGS) -x c - + | $(CC) -S $(MOARFLAGS) -o $@.tmp $(CFLAGS) $(CPPFLAGS) -x c - echo '# GENERATED FILE\n' > $@.tmp2 echo '# Constant definitions for pretty printers.' >> $@.tmp2 echo '# See gen-py-const.awk for details.\n' >> $@.tmp2 @@ -276,10 +281,11 @@ ifdef gen-as-const-headers # Generating headers for assembly constants. # We need this defined early to get into before-compile before # it's used in sysd-rules, below. +# clang's integrated assembler doesn't like the freaky tokens. $(common-objpfx)%.h $(common-objpfx)%.h.d: $(..)scripts/gen-as-const.awk \ %.sym $(common-before-compile) $(AWK) -f $< $(filter %.sym,$^) \ - | $(CC) -S -o $(@:.h.d=.h)T3 $(CFLAGS) $(CPPFLAGS) -x c - \ + | $(CC) -S $(MOARFLAGS) -o $(@:.h.d=.h)T3 $(CFLAGS) $(CPPFLAGS) -x c - \ -MD -MP -MF $(@:.h=.h.d)T -MT '$(@:.h=.h.d) $(@:.h.d=.h)' sed -n 's/^.*@@@name@@@\([^@]*\)@@@value@@@[^0-9Xxa-fA-F-]*\([0-9Xxa-fA-F-][0-9Xxa-fA-F-]*\).*@@@end@@@.*$$/#define \1 \2/p' \ $(@:.h.d=.h)T3 > $(@:.h.d=.h)T |