Changes in uspace/Makefile.common [1dcc0b9:795e2bf] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/Makefile.common
r1dcc0b9 r795e2bf 120 120 LIBPOSIX_PREFIX = $(LIB_PREFIX)/posix 121 121 122 LIBCRYPTO_PREFIX = $(LIB_PREFIX)/crypto123 122 LIBBLOCK_PREFIX = $(LIB_PREFIX)/block 124 123 LIBFS_PREFIX = $(LIB_PREFIX)/fs … … 144 143 LIBNET_PREFIX = $(LIB_PREFIX)/net 145 144 LIBNIC_PREFIX = $(LIB_PREFIX)/nic 146 LIBIEEE80211_PREFIX = $(LIB_PREFIX)/ieee80211147 145 LIBMINIX_PREFIX = $(LIB_PREFIX)/minix 148 146 LIBCOMPRESS_PREFIX = $(LIB_PREFIX)/compress … … 249 247 # something won't break because of that: 250 248 # -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) -finput-charset=UTF-8 251 CLANG_CFLAGS = $( LIBC_INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \249 CLANG_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \ 252 250 -ffreestanding -fno-builtin -nostdlib -nostdinc \ 253 251 -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \ 254 -Werror-implicit-function-declaration -Wwrite-strings \ 255 -integrated-as \ 256 -pipe -g -target $(CLANG_TARGET) -D__$(ENDIANESS)__ 252 -std=gnu99 -Werror-implicit-function-declaration -Wwrite-strings \ 253 -integrated-as -pipe -g -target $(CLANG_TARGET) -D__$(ENDIANESS)__ 257 254 258 255 LIB_CFLAGS = $(CFLAGS) -fPIC -D__IN_SHARED_LIBC__ … … 292 289 293 290 ifeq ($(COMPILER),gcc_cross) 294 CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)291 CFLAGS += $(GCC_CFLAGS) 295 292 DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) 296 293 endif 297 294 298 295 ifeq ($(COMPILER),gcc_helenos) 299 CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)296 CFLAGS += $(GCC_CFLAGS) 300 297 DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) 301 298 endif 302 299 303 300 ifeq ($(COMPILER),gcc_native) 304 CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)301 CFLAGS += $(GCC_CFLAGS) 305 302 DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) 306 303 endif 307 304 308 305 ifeq ($(COMPILER),icc) 309 CFLAGS += $(ICC_CFLAGS) $(EXTRA_CFLAGS)306 CFLAGS += $(ICC_CFLAGS) 310 307 DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) 311 308 endif 312 309 313 310 ifeq ($(COMPILER),clang) 314 CFLAGS += $(CLANG_CFLAGS) $(EXTRA_CFLAGS) 315 GCC_CFLAGS += $(EXTRA_CFLAGS) 311 CFLAGS += $(CLANG_CFLAGS) 316 312 DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) 317 313 endif … … 375 371 376 372 %.o: %.S $(DEPEND) 377 $(GCC) $(DEFS) $(GCC_CFLAGS) -D__ASM__ -c $< -o $@378 ifeq ($(PRECHECK),y) 379 $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) -D__ASM__373 $(GCC) $(DEFS) $(GCC_CFLAGS) $(EXTRA_CFLAGS) -D__ASM__ -c $< -o $@ 374 ifeq ($(PRECHECK),y) 375 $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) -D__ASM__ 380 376 endif 381 377 … … 387 383 388 384 %.o: %.c $(DEPEND) 389 $(CC) $(DEFS) $(CFLAGS) -c $< -o $@390 ifeq ($(PRECHECK),y) 391 $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS) 385 $(CC) $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) -c $< -o $@ 386 ifeq ($(PRECHECK),y) 387 $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) 392 388 endif 393 389 394 390 %.test.o: %.c $(DEPEND) 395 $(CC) $(DEFS) $(CFLAGS) $( TEST_CFLAGS) -c $< -o $@396 ifeq ($(PRECHECK),y) 397 $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS) 391 $(CC) $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(TEST_CFLAGS) -c $< -o $@ 392 ifeq ($(PRECHECK),y) 393 $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(TEST_CFLAGS) 398 394 endif 399 395 400 396 %.lo: %.S $(DEPEND) 401 $(CC) $(DEFS) $(LIB_CFLAGS) -D__ASM__ -c $< -o $@402 ifeq ($(PRECHECK),y) 403 $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $( CFLAGS) -D__ASM__397 $(CC) $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) -D__ASM__ -c $< -o $@ 398 ifeq ($(PRECHECK),y) 399 $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) -D__ASM__ 404 400 endif 405 401 … … 411 407 412 408 %.lo: %.c $(DEPEND) 413 $(CC) $(DEFS) $(LIB_CFLAGS) -c $< -o $@414 ifeq ($(PRECHECK),y) 415 $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $( CFLAGS)409 $(CC) $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) -c $< -o $@ 410 ifeq ($(PRECHECK),y) 411 $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) 416 412 endif 417 413 418 414 $(DEPEND): $(PRE_DEPEND) 419 makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) $(TEST_SOURCES) > $@ 2> /dev/null415 makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) $(EXTRA_CFLAGS) -- $(SOURCES) $(TEST_SOURCES) > $@ 2> /dev/null 420 416 -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ 421 417
Note:
See TracChangeset
for help on using the changeset viewer.