Changes in boot/Makefile.build [94c05b89:a0a273e] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
boot/Makefile.build
r94c05b89 ra0a273e 36 36 DEFS = -DBOOT -DRELEASE=$(RELEASE) "-DCOPYRIGHT=$(COPYRIGHT)" "-DNAME=$(NAME)" -D__$(BITS)_BITS__ -D__$(ENDIANESS)__ 37 37 38 AFLAGS = 38 39 LFLAGS = --fatal-warnings 39 40 40 GCC_CFLAGS = $(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \ 41 -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \ 42 -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \ 43 -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \ 41 # FIXME: This condition is a workaround for issue #693. 42 ifneq ($(BARCH),mips32) 43 AFLAGS += --fatal-warnings 44 endif 45 46 COMMON_CFLAGS = $(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \ 47 -ffreestanding -fno-builtin -nostdlib -nostdinc \ 48 -fexec-charset=UTF-8 -finput-charset=UTF-8 49 50 GCC_CFLAGS = -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \ 44 51 -std=gnu99 -Werror-implicit-function-declaration -Wwrite-strings \ 45 52 -pipe 46 53 47 ICC_CFLAGS = $(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \ 48 -ffreestanding -fno-builtin -nostdlib -nostdinc -Wall -Wmissing-prototypes \ 49 -Werror-implicit-function-declaration -wd170 54 ICC_CFLAGS = -Wall -Wmissing-prototypes -Werror-implicit-function-declaration -wd170 50 55 51 CLANG_CFLAGS = $(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \ 52 -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \ 53 -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \ 54 -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \ 56 CLANG_CFLAGS = -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \ 55 57 -Werror-implicit-function-declaration -Wwrite-strings \ 56 -pipe 58 -pipe -fno-stack-protector -fno-PIC 57 59 58 60 ifeq ($(CONFIG_DEBUG),y) 59 GCC_CFLAGS += -Werror 60 ICC_CFLAGS += -Werror 61 COMMON_CFLAGS += -Werror 61 62 endif 62 63 63 64 ifeq ($(CONFIG_LINE_DEBUG),y) 64 GCC_CFLAGS += -g 65 ICC_CFLAGS += -g 66 CLANG_CFLAGS += -g 65 COMMON_CFLAGS += -g 67 66 endif 68 67 69 68 ifeq ($(COMPILER),gcc_native) 70 CFLAGS = $( GCC_CFLAGS) $(EXTRA_CFLAGS)69 CFLAGS = $(COMMON_CFLAGS) $(GCC_CFLAGS) $(EXTRA_CFLAGS) 71 70 DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) 72 71 endif 73 72 74 73 ifeq ($(COMPILER),gcc_cross) 75 CFLAGS = $( GCC_CFLAGS) $(EXTRA_CFLAGS)74 CFLAGS = $(COMMON_CFLAGS) $(GCC_CFLAGS) $(EXTRA_CFLAGS) 76 75 DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) 77 76 endif 78 77 79 78 ifeq ($(COMPILER),gcc_helenos) 80 CFLAGS = $( GCC_CFLAGS) $(EXTRA_CFLAGS)79 CFLAGS = $(COMMON_CFLAGS) $(GCC_CFLAGS) $(EXTRA_CFLAGS) 81 80 DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) 82 81 endif … … 84 83 85 84 ifeq ($(COMPILER),icc) 86 CFLAGS = $( ICC_CFLAGS) $(EXTRA_CFLAGS)85 CFLAGS = $(COMMON_CFLAGS) $(ICC_CFLAGS) $(EXTRA_CFLAGS) 87 86 DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) 88 87 endif 89 88 90 89 ifeq ($(COMPILER),clang) 91 CFLAGS = $(C LANG_CFLAGS) $(EXTRA_CFLAGS)90 CFLAGS = $(COMMON_CFLAGS) $(CLANG_CFLAGS) $(EXTRA_CFLAGS) 92 91 DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) 93 92 endif … … 105 104 endif 106 105 106 AS_CFLAGS := $(addprefix -Xassembler ,$(AFLAGS)) 107 107 108 $(BOOT_OUTPUT): $(RAW) 108 109 $(OBJCOPY) -O $(BFD_OUTPUT) $< $@ … … 112 113 113 114 $(LINK): $(DEPEND) 114 $( GCC) $(DEFS) $(GCC_CFLAGS) -D__ASM__ -D__LINKER__ -E -x c $(LINK).in | grep -v "^\#" > $(LINK)115 $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -D__LINKER__ -E -x c $(LINK).in | grep -v "^\#" > $(LINK) 115 116 116 117 %.o: %.S $(DEPEND) 117 $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@118 $(CC) $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__ -c $< -o $@ 118 119 ifeq ($(PRECHECK),y) 119 120 $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) -D__ASM__ … … 127 128 128 129 %.o: %.s $(DEPEND) 129 $( AS) $(AFLAGS) -o $@ $<130 $(CC) $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__ -c $< -o $@ 130 131 ifeq ($(PRECHECK),y) 131 132 $(JOBFILE) $(JOB) $< $@ as asm
Note:
See TracChangeset
for help on using the changeset viewer.