Changes in boot/Makefile.build [fe171357:4761f54] in mainline

File:

• boot/Makefile.build (modified) (4 diffs)

boot/Makefile.build

@@ -31 +31 @@
 include Makefile.common
 
-INCLUDES = -Igeneric/include -Iarch/$(KARCH)/include -Igenarch/include -I$(ROOT_PATH)/abi/include
+INCLUDES = -Igeneric/include -I$(ROOT_PATH)/abi/include
 OPTIMIZATION = 3
 
 DEFS = -DBOOT -DRELEASE=$(RELEASE) "-DCOPYRIGHT=$(COPYRIGHT)" "-DNAME=$(NAME)" -D__$(BITS)_BITS__ -D__$(ENDIANESS)__
 
-AFLAGS = --fatal-warnings
-LFLAGS = --fatal-warnings --warn-common
+AFLAGS =
+LFLAGS = --fatal-warnings
+
+# FIXME: This condition is a workaround for issue #693.
+ifneq ($(BARCH),mips32)
+        AFLAGS += --fatal-warnings
+endif
 
 COMMON_CFLAGS = $(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
         -ffreestanding -fno-builtin -nostdlib -nostdinc \
-        -fexec-charset=UTF-8 -finput-charset=UTF-8 -fno-common \
-        -fdebug-prefix-map=$(realpath $(ROOT_PATH))=.
+        -fexec-charset=UTF-8 -finput-charset=UTF-8
 
 GCC_CFLAGS = -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \
@@ -72 +76 @@
 
 clean:
-        rm -f $(RAW) $(MAP)
+        rm -f $(RAW) $(MAP) $(ARCH_INCLUDE) $(GENARCH_INCLUDE)
 
 -include $(DEPENDS)
@@ -87 +91 @@
         $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -D__LINKER__ -E -x c $(LINK).in | grep -v "^\#" > $(LINK)
 
-%.o: %.s | depend
-        $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__
-
 %.o: %.S | depend
-        $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__
+        $(CC) -MD $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__ -c $< -o $@
+ifeq ($(PRECHECK),y)
+        $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) -D__ASM__
+endif
 
 %.o: %.c | depend
-        $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS)
+        $(CC) -MD $(DEFS) $(CFLAGS) -c $< -o $@
+ifeq ($(PRECHECK),y)
+        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
+endif
 
-depend: $(PRE_DEPEND)
+%.o: %.s | depend
+        $(CC) -MD $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__ -c $< -o $@
+ifeq ($(PRECHECK),y)
+        $(JOBFILE) $(JOB) $< $@ as asm
+endif
+
+depend: $(ARCH_INCLUDE) $(GENARCH_INCLUDE) $(COMMON_HEADER_ARCH) $(PRE_DEPEND)
 
 $(COMPS).s: $(COMPS).zip
@@ -115 +128 @@
 include Makefile.initrd
 
+$(ARCH_INCLUDE): arch/$(KARCH)/include/
+        ln -sfn ../../$< $@
+
+$(GENARCH_INCLUDE): genarch/include/
+        ln -sfn ../../$< $@
+
+$(COMMON_HEADER_ARCH): $(COMMON_HEADER)
+        ln -sfn ../../../$< $@