diff options
| -rw-r--r-- | toolchain/Makefile | 7 | ||||
| -rw-r--r-- | tools/Makefile | 13 | ||||
| -rw-r--r-- | tools/ext2fs/Makefile | 4 |
3 files changed, 14 insertions, 10 deletions
diff --git a/toolchain/Makefile b/toolchain/Makefile index ed563f00e..2d8d88219 100644 --- a/toolchain/Makefile +++ b/toolchain/Makefile @@ -22,6 +22,7 @@ all: install download: $(TARGETS_DOWNLOAD) install: $(TARGETS_INSTALL) clean: $(TARGETS_CLEAN) +$(TARGETS_INSTALL): $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME) uClibc-prepare: kernel-headers-prepare ifeq ($(CONFIG_NATIVE_TOOLCHAIN),) @@ -34,6 +35,10 @@ gcc-install: uClibc-install TOOLCHAIN_STAMP_DIR:=$(STAGING_DIR)/stampfiles +$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME): + @mkdir -p $@ + @ln -sf ../lib $@/lib + $(TOOLCHAIN_STAMP_DIR): mkdir -p $@ @@ -43,7 +48,7 @@ $(TOOLCHAIN_BUILD_DIR): %-download: FORCE $(MAKE) -C $(patsubst %-download,%,$@) download -%-prepare: $(TOOLCHAIN_STAMP_DIR) $(STAGING_DIR) $(TOOLCHAIN_BUILD_DIR) FORCE +%-prepare: $(TOOLCHAIN_STAMP_DIR) $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME) $(TOOLCHAIN_BUILD_DIR) FORCE @[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || { \ $(MAKE) -C $(patsubst %-prepare,%,$@) prepare; \ } diff --git a/tools/Makefile b/tools/Makefile index 741fd48f6..c8fad2323 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -10,6 +10,7 @@ include $(TOPDIR)/rules.mk TARGETS-y:=sed sstrip ipkg-utils ext2fs squashfs mtd-utils lzma mkimage TARGETS_DOWNLOAD:=$(patsubst %,%-download,$(TARGETS-y)) +TARGETS_PREPARE:=$(patsubst %,%-prepare,$(TARGETS-y)) TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS-y)) TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS-y)) @@ -25,13 +26,9 @@ TOOL_STAMP_DIR:=$(STAGING_DIR)/stampfiles $(TOOL_STAMP_DIR): mkdir -p $@ -$(STAGING_DIR): - @mkdir -p $@/lib - @mkdir -p $@/include - @mkdir -p $@/include-host - $(CP) ./include/*.h $@/include-host/ - @ln -sf ../lib $@/$(REAL_GNU_TARGET_NAME)/lib - @mkdir -p $@/$(REAL_GNU_TARGET_NAME) +$(STAGING_DIR)/include-host: + @mkdir -p $@ + @$(CP) ./include/*.h $@/ $(TOOL_BUILD_DIR): @mkdir -p $@ @@ -39,7 +36,7 @@ $(TOOL_BUILD_DIR): %-download: FORCE $(MAKE) -C $(patsubst %-download,%,$@) download -%-prepare: $(TOOL_STAMP_DIR) $(STAGING_DIR) $(TOOL_BUILD_DIR) FORCE +%-prepare: $(TOOL_STAMP_DIR) $(STAGING_DIR)/include-host $(TOOL_BUILD_DIR) FORCE @[ -f $(TOOL_STAMP_DIR)/.tool_$@ ] || { \ $(MAKE) -C $(patsubst %-prepare,%,$@) prepare; \ } diff --git a/tools/ext2fs/Makefile b/tools/ext2fs/Makefile index dd60a7eb9..f10adbb6c 100644 --- a/tools/ext2fs/Makefile +++ b/tools/ext2fs/Makefile @@ -42,7 +42,9 @@ define Build/Configure endef define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) all + $(MAKE) -C $(PKG_BUILD_DIR) \ + CFLAGS="-O2 -I $(STAGING_DIR)/include-host -include getline.h" \ + all endef define Build/Install |