mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-29 15:44:04 +00:00
toolchain: remove installing twice in the "initial" subdir
This was apparently introduced to recreate the toolchain (wipe staging_dir/toolchain*, but keep build_dir/toolchain*, followed by a `make toolchain/compile`). But it leaves leftovers and causes re-links to happen at src_install phase, because of the changed paths, possibly adding yet another source of issues. With the prior commits removing various hacks related to the "initial" folder we can remove installing it twice altogether. The recreated toolchain is exactly the same as before. Signed-off-by: Andre Heider <a.heider@gmail.com>
This commit is contained in:
parent
4d384d28e4
commit
7ae4716243
@ -29,7 +29,6 @@ EXCLUDE_DIRS:= \
|
||||
*/man \
|
||||
*/info \
|
||||
*/root-* \
|
||||
initial \
|
||||
*.install.clean \
|
||||
*.install.flags \
|
||||
*.install \
|
||||
|
@ -91,14 +91,9 @@ define Host/Compile
|
||||
endef
|
||||
|
||||
define Host/Install
|
||||
mkdir -p $(TOOLCHAIN_DIR)/initial
|
||||
$(MAKE) -C $(HOST_BUILD_DIR) \
|
||||
prefix=$(TOOLCHAIN_DIR)/initial \
|
||||
install
|
||||
$(MAKE) -C $(HOST_BUILD_DIR) \
|
||||
prefix=$(TOOLCHAIN_DIR) \
|
||||
install
|
||||
$(call FixupLibdir,$(TOOLCHAIN_DIR)/initial)
|
||||
$(call FixupLibdir,$(TOOLCHAIN_DIR))
|
||||
$(CP) $(TOOLCHAIN_DIR)/bin/$(REAL_GNU_TARGET_NAME)-readelf $(HOST_BUILD_PREFIX)/bin/readelf
|
||||
endef
|
||||
|
||||
|
@ -19,12 +19,10 @@ endef
|
||||
|
||||
define Host/Install
|
||||
+$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) \
|
||||
prefix="$(TOOLCHAIN_DIR)/initial" \
|
||||
install-gcc \
|
||||
install-target-libgcc
|
||||
|
||||
$(call FixupLibdir,$(TOOLCHAIN_DIR)/initial)
|
||||
$$(call file_copy,$(TOOLCHAIN_DIR)/initial/.,$(TOOLCHAIN_DIR)/)
|
||||
$(call FixupLibdir,$(TOOLCHAIN_DIR))
|
||||
endef
|
||||
|
||||
$(eval $(call HostBuild))
|
||||
|
Loading…
x
Reference in New Issue
Block a user