From 2e3dfee0406b39f43ac934c9eb24a1ad5a4e1472 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Fri, 28 Nov 2014 17:31:46 +0800 Subject: [PATCH] magic: Force the use of gcc for scriptic Scriptic uses some directives that aren't available in clang, so assemble scripts using gcc. Signed-off-by: Sean Cross --- magic.mk | 4 ++-- mkenv.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/magic.mk b/magic.mk index d069b5e..8b4c4e6 100644 --- a/magic.mk +++ b/magic.mk @@ -16,8 +16,8 @@ vpath %.S . $(TOP) $(BUILD)/%.o: %.S - $(ECHO) "CC $<" - $(Q)$(CC) $(CFLAGS) $(AFLAGS) -c -o $@ $< + $(ECHO) "AS $<" + $(Q)$(AS) $(AFLAGS) -c -o $@ $< vpath %.s . $(TOP) $(BUILD)/%.o: %.s diff --git a/mkenv.mk b/mkenv.mk index e6708d0..7c651e1 100644 --- a/mkenv.mk +++ b/mkenv.mk @@ -43,7 +43,7 @@ MKDIR = mkdir SED = sed PYTHON = python -AS = $(CROSS_COMPILE)as +AS = $(CROSS_COMPILE)gcc $(CFLAGS) -D__ASSEMBLY__ CC = $(CROSS_COMPILE)clang LD = $(CROSS_COMPILE)ld OBJCOPY = $(CROSS_COMPILE)objcopy