Commit eae6183a authored by Russell King's avatar Russell King

[ARM] Fix builds using O=

parent b8b8a346
...@@ -99,7 +99,7 @@ TEXTADDR := $(textaddr-y) ...@@ -99,7 +99,7 @@ TEXTADDR := $(textaddr-y)
ifeq ($(incdir-y),) ifeq ($(incdir-y),)
incdir-y := $(machine-y) incdir-y := $(machine-y)
endif endif
INCDIR := $(incdir-y) INCDIR := arch-$(incdir-y)
export TEXTADDR GZFLAGS export TEXTADDR GZFLAGS
...@@ -133,8 +133,13 @@ boot := arch/arm/boot ...@@ -133,8 +133,13 @@ boot := arch/arm/boot
# last, otherwise make uses the target directory mtime. # last, otherwise make uses the target directory mtime.
include/asm-arm/.arch: $(wildcard include/config/arch/*.h) include/config/MARKER include/asm-arm/.arch: $(wildcard include/config/arch/*.h) include/config/MARKER
@echo ' SYMLINK include/asm-arm/arch -> include/asm-arm/arch-$(INCDIR)' @echo ' SYMLINK include/asm-arm/arch -> include/asm-arm/$(INCDIR)'
@ln -fsn arch-$(INCDIR) include/asm-arm/arch ifneq ($(KBUILD_SRC),)
$(Q)mkdir -p include/asm-arm
$(Q)ln -fsn $(srctree)/include/asm-arm/$(INCDIR) include/asm-arm/arch
else
$(Q)ln -fsn $(INCDIR) include/asm-arm/arch
endif
@touch $@ @touch $@
prepare: maketools include/asm-arm/.arch prepare: maketools include/asm-arm/.arch
......
...@@ -4,6 +4,6 @@ ...@@ -4,6 +4,6 @@
# Copyright (C) 2001 Russell King # Copyright (C) 2001 Russell King
# #
include/asm-arm/mach-types.h: $(obj)/mach-types $(obj)/gen-mach-types include/asm-arm/mach-types.h: $(src)/gen-mach-types $(src)/mach-types
@echo ' Generating $@' @echo ' Generating $@'
@$(AWK) -f $(obj)/gen-mach-types $(obj)/mach-types > $@ $(Q)$(AWK) -f $^ > $@ || { rm -f $@; /bin/false; }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment