Changeset 7f881cd8 in mainline for uspace/Makefile.common


Ignore:
Timestamp:
2017-11-06T21:04:24Z (6 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.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile.common

    rbd92e6d5 r7f881cd8  
    272272#
    273273
    274 JOBFILE = $(LIBC_PREFIX)/../../../tools/jobfile.py
     274ifeq ($(PRECHECK),y)
     275        JOBFILE = $(LIBC_PREFIX)/../../../tools/jobfile.py
     276        # XXX: Do not change the order of arguments.
     277        CC_JOB = $(JOBFILE) $(JOB) $(CC) $< -o $@
     278else
     279        CC_JOB = $(CC) $< -o $@
     280endif
    275281
    276282ifeq ($(COMPILER),clang)
    … …  
    336342
    337343%.o: %.S | depend
    338         $(CC) -MD $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS) -D__ASM__ -c $< -o $@
    339 ifeq ($(PRECHECK),y)
    340         $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) -D__ASM__
    341 endif
     344        $(CC_JOB) -c -MD $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS) -D__ASM__
    342345
    343346%.o: %.s | depend
    344         $(CC) -MD $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS) -D__ASM__ -c $< -o $@
    345 ifeq ($(PRECHECK),y)
    346         $(JOBFILE) $(JOB) $< $@ as asm
    347 endif
     347        $(CC_JOB) -c -MD $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS) -D__ASM__
    348348
    349349%.o: %.c | depend
    350         $(CC) -MD $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) -c $< -o $@
    351 ifeq ($(PRECHECK),y)
    352         $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS)
    353 endif
     350        $(CC_JOB) -c -MD $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS)
    354351
    355352%.test.o: %.c | depend
    356         $(CC) -MD $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(TEST_CFLAGS) -c $< -o $@
    357 ifeq ($(PRECHECK),y)
    358         $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(TEST_CFLAGS)
    359 endif
     353        $(CC_JOB) -c -MD $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(TEST_CFLAGS)
    360354
    361355%.lo: %.S | depend
    362         $(CC) -MD $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS) -D__ASM__ -c $< -o $@
    363 ifeq ($(PRECHECK),y)
    364         $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) -D__ASM__
    365 endif
     356        $(CC_JOB) -c -MD $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS) -D__ASM__
    366357
    367358%.lo: %.s | depend
    368         $(CC) -MD $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS) -D__ASM__ -c $< -o $@
    369 ifeq ($(PRECHECK),y)
    370         $(JOBFILE) $(JOB) $< $@ as asm
    371 endif
     359        $(CC_JOB) -c -MD $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS) -D__ASM__
    372360
    373361%.lo: %.c | depend
    374         $(CC) -MD $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) -c $< -o $@
    375 ifeq ($(PRECHECK),y)
    376         $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS)
    377 endif
     362        $(CC_JOB) -c -MD $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS)
    378363
    379364depend: $(PRE_DEPEND)
Note: See TracChangeset for help on using the changeset viewer.