Changeset 055a68a in mainline for uspace/Makefile.common


Ignore:
Timestamp:
2015-04-23T23:47:40Z (10 years ago)
Author:
Michal Koutný <xm.koutny+hos@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a18a8b9
Parents:
acb8766e (diff), dcba819 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/Makefile.common

    racb8766e r055a68a  
    120120LIBPOSIX_PREFIX = $(LIB_PREFIX)/posix
    121121
     122LIBCRYPTO_PREFIX = $(LIB_PREFIX)/crypto
    122123LIBBLOCK_PREFIX = $(LIB_PREFIX)/block
    123124LIBFS_PREFIX = $(LIB_PREFIX)/fs
     
    143144LIBNET_PREFIX = $(LIB_PREFIX)/net
    144145LIBNIC_PREFIX = $(LIB_PREFIX)/nic
     146LIBIEEE80211_PREFIX = $(LIB_PREFIX)/ieee80211
    145147LIBMINIX_PREFIX = $(LIB_PREFIX)/minix
    146148LIBCOMPRESS_PREFIX = $(LIB_PREFIX)/compress
     
    247249# something won't break because of that:
    248250# -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) -finput-charset=UTF-8
    249 CLANG_CFLAGS = $(LIBC_INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
     251CLANG_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
    250252        -ffreestanding -fno-builtin -nostdlib -nostdinc \
    251253        -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \
    252         -Werror-implicit-function-declaration -Wwrite-strings \
    253         -integrated-as \
    254         -pipe -g -target $(CLANG_TARGET) -D__$(ENDIANESS)__
     254        -std=gnu99 -Werror-implicit-function-declaration -Wwrite-strings \
     255        -integrated-as -pipe -g -target $(CLANG_TARGET) -D__$(ENDIANESS)__
    255256
    256257LIB_CFLAGS = $(CFLAGS) -fPIC -D__IN_SHARED_LIBC__
     
    290291
    291292ifeq ($(COMPILER),gcc_cross)
    292         CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)
     293        CFLAGS += $(GCC_CFLAGS)
    293294        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    294295endif
    295296
    296297ifeq ($(COMPILER),gcc_helenos)
    297         CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)
     298        CFLAGS += $(GCC_CFLAGS)
    298299        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    299300endif
    300301
    301302ifeq ($(COMPILER),gcc_native)
    302         CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)
     303        CFLAGS += $(GCC_CFLAGS)
    303304        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    304305endif
    305306
    306307ifeq ($(COMPILER),icc)
    307         CFLAGS += $(ICC_CFLAGS) $(EXTRA_CFLAGS)
     308        CFLAGS += $(ICC_CFLAGS)
    308309        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    309310endif
    310311
    311312ifeq ($(COMPILER),clang)
    312         CFLAGS += $(CLANG_CFLAGS) $(EXTRA_CFLAGS)
    313         GCC_CFLAGS += $(EXTRA_CFLAGS)
     313        CFLAGS += $(CLANG_CFLAGS)
    314314        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    315315endif
     
    373373
    374374%.o: %.S $(DEPEND)
    375         $(GCC) $(DEFS) $(GCC_CFLAGS) -D__ASM__ -c $< -o $@
    376 ifeq ($(PRECHECK),y)
    377         $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) -D__ASM__
     375        $(GCC) $(DEFS) $(GCC_CFLAGS) $(EXTRA_CFLAGS) -D__ASM__ -c $< -o $@
     376ifeq ($(PRECHECK),y)
     377        $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) -D__ASM__
    378378endif
    379379
     
    385385
    386386%.o: %.c $(DEPEND)
    387         $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
    388 ifeq ($(PRECHECK),y)
    389         $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
     387        $(CC) $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) -c $< -o $@
     388ifeq ($(PRECHECK),y)
     389        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS)
    390390endif
    391391
    392392%.test.o: %.c $(DEPEND)
    393         $(CC) $(DEFS) $(CFLAGS) $(TEST_CFLAGS) -c $< -o $@
    394 ifeq ($(PRECHECK),y)
    395         $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
     393        $(CC) $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(TEST_CFLAGS) -c $< -o $@
     394ifeq ($(PRECHECK),y)
     395        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(TEST_CFLAGS)
    396396endif
    397397
    398398%.lo: %.S $(DEPEND)
    399         $(CC) $(DEFS) $(LIB_CFLAGS) -D__ASM__ -c $< -o $@
    400 ifeq ($(PRECHECK),y)
    401         $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) -D__ASM__
     399        $(CC) $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) -D__ASM__ -c $< -o $@
     400ifeq ($(PRECHECK),y)
     401        $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) -D__ASM__
    402402endif
    403403
     
    409409
    410410%.lo: %.c $(DEPEND)
    411         $(CC) $(DEFS) $(LIB_CFLAGS) -c $< -o $@
    412 ifeq ($(PRECHECK),y)
    413         $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
     411        $(CC) $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) -c $< -o $@
     412ifeq ($(PRECHECK),y)
     413        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS)
    414414endif
    415415
    416416$(DEPEND): $(PRE_DEPEND)
    417         makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) $(TEST_SOURCES) > $@ 2> /dev/null
     417        makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) $(EXTRA_CFLAGS) -- $(SOURCES) $(TEST_SOURCES) > $@ 2> /dev/null
    418418        -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@
    419419
Note: See TracChangeset for help on using the changeset viewer.