Changeset 055a68a in mainline for uspace/Makefile.common
- Timestamp:
- 2015-04-23T23:47:40Z (10 years ago)
- 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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/Makefile.common
racb8766e r055a68a 120 120 LIBPOSIX_PREFIX = $(LIB_PREFIX)/posix 121 121 122 LIBCRYPTO_PREFIX = $(LIB_PREFIX)/crypto 122 123 LIBBLOCK_PREFIX = $(LIB_PREFIX)/block 123 124 LIBFS_PREFIX = $(LIB_PREFIX)/fs … … 143 144 LIBNET_PREFIX = $(LIB_PREFIX)/net 144 145 LIBNIC_PREFIX = $(LIB_PREFIX)/nic 146 LIBIEEE80211_PREFIX = $(LIB_PREFIX)/ieee80211 145 147 LIBMINIX_PREFIX = $(LIB_PREFIX)/minix 146 148 LIBCOMPRESS_PREFIX = $(LIB_PREFIX)/compress … … 247 249 # something won't break because of that: 248 250 # -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) \251 CLANG_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \ 250 252 -ffreestanding -fno-builtin -nostdlib -nostdinc \ 251 253 -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)__ 255 256 256 257 LIB_CFLAGS = $(CFLAGS) -fPIC -D__IN_SHARED_LIBC__ … … 290 291 291 292 ifeq ($(COMPILER),gcc_cross) 292 CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)293 CFLAGS += $(GCC_CFLAGS) 293 294 DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) 294 295 endif 295 296 296 297 ifeq ($(COMPILER),gcc_helenos) 297 CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)298 CFLAGS += $(GCC_CFLAGS) 298 299 DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) 299 300 endif 300 301 301 302 ifeq ($(COMPILER),gcc_native) 302 CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)303 CFLAGS += $(GCC_CFLAGS) 303 304 DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) 304 305 endif 305 306 306 307 ifeq ($(COMPILER),icc) 307 CFLAGS += $(ICC_CFLAGS) $(EXTRA_CFLAGS)308 CFLAGS += $(ICC_CFLAGS) 308 309 DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) 309 310 endif 310 311 311 312 ifeq ($(COMPILER),clang) 312 CFLAGS += $(CLANG_CFLAGS) $(EXTRA_CFLAGS) 313 GCC_CFLAGS += $(EXTRA_CFLAGS) 313 CFLAGS += $(CLANG_CFLAGS) 314 314 DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) 315 315 endif … … 373 373 374 374 %.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 $@ 376 ifeq ($(PRECHECK),y) 377 $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) -D__ASM__ 378 378 endif 379 379 … … 385 385 386 386 %.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 $@ 388 ifeq ($(PRECHECK),y) 389 $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) 390 390 endif 391 391 392 392 %.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 $@ 394 ifeq ($(PRECHECK),y) 395 $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(TEST_CFLAGS) 396 396 endif 397 397 398 398 %.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 $@ 400 ifeq ($(PRECHECK),y) 401 $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) -D__ASM__ 402 402 endif 403 403 … … 409 409 410 410 %.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 $@ 412 ifeq ($(PRECHECK),y) 413 $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) 414 414 endif 415 415 416 416 $(DEPEND): $(PRE_DEPEND) 417 makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) $(TEST_SOURCES) > $@ 2> /dev/null417 makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) $(EXTRA_CFLAGS) -- $(SOURCES) $(TEST_SOURCES) > $@ 2> /dev/null 418 418 -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ 419 419
Note:
See TracChangeset
for help on using the changeset viewer.