From 91081e01b10d64e99dc485e477e6ae3b1171e8ce Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Fri, 13 May 2011 13:36:32 +0200 Subject: [PATCH] Revert "Fix building tools alone with host compiler" This reverts commit bbc6353c740064c8e0741b772376a1a67a1c3f01. It breaks building on many systems: ... .../common/env_embedded.c:28:20: fatal error: config.h: No such file or directory compilation terminated. .../common/image.c:27:20: fatal error: common.h: No such file or directory compilation terminated. .../lib/crc32.c:12:20: fatal error: common.h: No such file or directory compilation terminated. .../lib/md5.c:28:22: fatal error: compiler.h: No such file or directory compilation terminated. .../lib/sha1.c:33:20: fatal error: common.h: No such file or directory compilation terminated. --- tools/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 1ca497ece9..623f9086f3 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -140,7 +140,7 @@ NOPEDOBJS := $(addprefix $(obj),$(NOPED_OBJ_FILES-y)) # Use native tools and options # Define __KERNEL_STRICT_NAMES to prevent typedef overlaps # -HOSTCFLAGS = -idirafter $(SRCTREE)/include \ +HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \ -idirafter $(OBJTREE)/include2 \ -idirafter $(OBJTREE)/include \ -I $(SRCTREE)/lib/libfdt \ @@ -201,10 +201,10 @@ $(obj)ubsha1$(SFX): $(obj)os_support.o $(obj)sha1.o $(obj)ubsha1.o $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^ # Some of the tool objects need to be accessed from outside the tools directory -$(subst common/,,$(filter common/%,$(EXT_OBJ_FILES-y))): $(obj)%.o: $(SRCTREE)/common/%.c +$(obj)%.o: $(SRCTREE)/common/%.c $(HOSTCC) -g $(HOSTCFLAGS_NOPED) -c -o $@ $< -$(subst lib/,,$(filter lib/%,$(EXT_OBJ_FILES-y))): $(obj)%.o: $(SRCTREE)/lib/%.c +$(obj)%.o: $(SRCTREE)/lib/%.c $(HOSTCC) -g $(HOSTCFLAGS) -c -o $@ $< $(obj)%.o: $(SRCTREE)/lib/libfdt/%.c -- 2.39.2