Browse Source

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 <[email protected]>
Andre Heider 2 years ago
parent
commit
7ae4716243
3 changed files with 2 additions and 10 deletions
  1. 0 1
      target/sdk/Makefile
  2. 1 6
      toolchain/binutils/Makefile
  3. 1 3
      toolchain/gcc/initial/Makefile

+ 0 - 1
target/sdk/Makefile

@@ -29,7 +29,6 @@ EXCLUDE_DIRS:= \
 	*/man \
 	*/man \
 	*/info \
 	*/info \
 	*/root-* \
 	*/root-* \
-	initial \
 	*.install.clean \
 	*.install.clean \
 	*.install.flags \
 	*.install.flags \
 	*.install \
 	*.install \

+ 1 - 6
toolchain/binutils/Makefile

@@ -91,14 +91,9 @@ define Host/Compile
 endef
 endef
 
 
 define Host/Install
 define Host/Install
-	mkdir -p $(TOOLCHAIN_DIR)/initial
 	$(MAKE) -C $(HOST_BUILD_DIR) \
 	$(MAKE) -C $(HOST_BUILD_DIR) \
-		prefix=$(TOOLCHAIN_DIR)/initial \
 		install
 		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
 	$(CP) $(TOOLCHAIN_DIR)/bin/$(REAL_GNU_TARGET_NAME)-readelf $(HOST_BUILD_PREFIX)/bin/readelf
 endef
 endef
 
 

+ 1 - 3
toolchain/gcc/initial/Makefile

@@ -19,12 +19,10 @@ endef
 
 
 define Host/Install
 define Host/Install
 	+$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) \
 	+$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) \
-		prefix="$(TOOLCHAIN_DIR)/initial" \
 		install-gcc \
 		install-gcc \
 		install-target-libgcc
 		install-target-libgcc
 
 
-	$(call FixupLibdir,$(TOOLCHAIN_DIR)/initial)
-	$$(call file_copy,$(TOOLCHAIN_DIR)/initial/.,$(TOOLCHAIN_DIR)/)
+	$(call FixupLibdir,$(TOOLCHAIN_DIR))
 endef
 endef
 
 
 $(eval $(call HostBuild))
 $(eval $(call HostBuild))