Address doubing of target name in cross-compile installs

BrickBot · Sep 9, 2024 · cc558e6 · cc558e6
1 parent d212124
commit cc558e6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/src-projects/gcc-3.4.6/gcc/Makefile.in b/src-projects/gcc-3.4.6/gcc/Makefile.in
@@ -610,7 +610,7 @@ BUILD_CPPFLAGS=$(ALL_CPPFLAGS)
 
 # Actual name to use when installing a native compiler.
 GCC_INSTALL_NAME := $(shell echo gcc|sed '$(program_transform_name)')
-GCC_TARGET_INSTALL_NAME := $(target_noncanonical)-$(shell echo gcc|sed '$(program_transform_name)')
+GCC_TARGET_INSTALL_NAME := $(shell echo gcc|sed '$(program_transform_name)')
 CPP_INSTALL_NAME := $(shell echo cpp|sed '$(program_transform_name)')
 PROTOIZE_INSTALL_NAME := $(shell echo protoize|sed '$(program_transform_name)')
 UNPROTOIZE_INSTALL_NAME := $(shell echo unprotoize|sed '$(program_transform_name)')

diff --git a/src-projects/gcc-3.4.6/gcc/cp/Make-lang.in b/src-projects/gcc-3.4.6/gcc/cp/Make-lang.in
@@ -39,8 +39,8 @@
 # Actual names to use when installing a native compiler.
 CXX_INSTALL_NAME := $(shell echo c++|sed '$(program_transform_name)')
 GXX_INSTALL_NAME := $(shell echo g++|sed '$(program_transform_name)')
-CXX_TARGET_INSTALL_NAME := $(target_noncanonical)-$(shell echo c++|sed '$(program_transform_name)')
-GXX_TARGET_INSTALL_NAME := $(target_noncanonical)-$(shell echo g++|sed '$(program_transform_name)')
+CXX_TARGET_INSTALL_NAME := $(shell echo c++|sed '$(program_transform_name)')
+GXX_TARGET_INSTALL_NAME := $(shell echo g++|sed '$(program_transform_name)')
 
 #
 # Define the names for selecting c++ in LANGUAGES.

diff --git a/src-projects/gcc-3.4.6/gcc/java/Make-lang.in b/src-projects/gcc-3.4.6/gcc/java/Make-lang.in
@@ -43,8 +43,8 @@
 
 # Actual names to use when installing a native compiler.
 JAVA_INSTALL_NAME := $(shell echo gcj|sed '$(program_transform_name)')
-JAVA_TARGET_INSTALL_NAME := $(target_noncanonical)-$(shell echo gcj|sed '$(program_transform_name)')
-GCJH_TARGET_INSTALL_NAME := $(target_noncanonical)-$(shell echo gcjh|sed '$(program_transform_name)')
+JAVA_TARGET_INSTALL_NAME := $(shell echo gcj|sed '$(program_transform_name)')
+GCJH_TARGET_INSTALL_NAME := $(shell echo gcjh|sed '$(program_transform_name)')
 
 GCJ = gcj
 

diff --git a/src-projects/gpc-2.1-20070904/p/Make-lang.in b/src-projects/gpc-2.1-20070904/p/Make-lang.in
@@ -199,9 +199,7 @@ MAKEGPCWITHGCCBINDIST=tar $(GPC_TARFLAGS) ../gpc-$$version-with-gcc.$(target).ta
 GPC_INSTALL_NAME=`t='$(program_transform_name)'; echo gpc | sed $$t`
 
 # Actual names to use when installing a cross-compiler.
-GPC_CROSS_NAME_=`t='$(program_transform_cross_name)'; echo gpc | sed $$t`
-GPC_CROSS_NAME_34=$(target_noncanonical)`t='$(program_transform_name)'; echo gpc | sed $$t`
-GPC_CROSS_NAME=$(GPC_CROSS_NAME_$(GPC_GCC_34_))
+GPC_CROSS_NAME=`t='$(program_transform_cross_name)'; echo gpc | sed $$t`
 
 # The GPC to use for compiling libgpc.a
 # Usually the one we just built.