Changeset 7f881cd8 in mainline for boot

Timestamp:

2017-11-06T21:04:24Z (8 years ago)

Author:

jzr <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

68825c3

Parents:

bd92e6d5

Message:

Simplify make precheck.

Location:

boot

Files:

• Makefile.build (modified) (1 diff)
• Makefile.common (modified) (1 diff)

boot/Makefile.build

@@ -92 +92 @@
         $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -D__LINKER__ -E -x c $(LINK).in | grep -v "^\#" > $(LINK)
 
+%.o: %.s | depend
+        $(CC_JOB) -c -MD $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__
+
 %.o: %.S | depend
-        $(CC) -MD $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__ -c $< -o $@
-ifeq ($(PRECHECK),y)
-        $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) -D__ASM__
-endif
+        $(CC_JOB) -c -MD $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__
 
 %.o: %.c | depend
-        $(CC) -MD $(DEFS) $(CFLAGS) -c $< -o $@
-ifeq ($(PRECHECK),y)
-        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
-endif
-
-%.o: %.s | depend
-        $(CC) -MD $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__ -c $< -o $@
-ifeq ($(PRECHECK),y)
-        $(JOBFILE) $(JOB) $< $@ as asm
-endif
+        $(CC_JOB) -c -MD $(DEFS) $(CFLAGS)
 
 depend: $(PRE_DEPEND)

boot/Makefile.common

@@ -57 +57 @@
 MKUIMAGE = $(TOOLS_PATH)/mkuimage.py
 
-JOBFILE = $(ROOT_PATH)/tools/jobfile.py
+ifeq ($(PRECHECK),y)
+        JOBFILE = $(TOOLS_PATH)/jobfile.py
+        # XXX: Do not change the order of arguments.
+        CC_JOB = $(JOBFILE) $(JOB) $(CC) $< -o $@
+else
+        CC_JOB = $(CC) $< -o $@
+endif
 
 DISTROOT = distroot