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

File:

• boot/Makefile.build (modified) (6 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
 
@@ -37 +37 @@
 
 AFLAGS =
-LFLAGS = --fatal-warnings --warn-common
+LFLAGS = --fatal-warnings
 
 # FIXME: This condition is a workaround for issue #693.
@@ -46 +46 @@
 COMMON_CFLAGS = $(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
         -ffreestanding -fno-builtin -nostdlib -nostdinc \
-        -fexec-charset=UTF-8 -finput-charset=UTF-8 -fno-common
+        -fexec-charset=UTF-8 -finput-charset=UTF-8
 
 GCC_CFLAGS = -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \
@@ -76 +76 @@
 
 clean:
-        rm -f $(RAW) $(MAP)
+        rm -f $(RAW) $(MAP) $(ARCH_INCLUDE) $(GENARCH_INCLUDE)
 
 -include $(DEPENDS)
@@ -109 +109 @@
 endif
 
-depend: $(PRE_DEPEND)
+depend: $(ARCH_INCLUDE) $(GENARCH_INCLUDE) $(COMMON_HEADER_ARCH) $(PRE_DEPEND)
 
 $(COMPS).s: $(COMPS).zip
@@ -128 +128 @@
 include Makefile.initrd
 
+$(ARCH_INCLUDE): arch/$(KARCH)/include/
+        ln -sfn ../../$< $@
+
+$(GENARCH_INCLUDE): genarch/include/
+        ln -sfn ../../$< $@
+
+$(COMMON_HEADER_ARCH): $(COMMON_HEADER)
+        ln -sfn ../../../$< $@