Skip to content

Commit 985cc94

Browse files
authored
toolchain/gcc: GCC12 sync upstream (coolsnowwolf#10080)
1 parent 43f8817 commit 985cc94

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

toolchain/gcc/common.mk

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,12 @@ define Host/SetToolchainInfo
191191
$(SED) 's,GCC_VERSION=.*,GCC_VERSION=$(GCC_VERSION),' $(TOOLCHAIN_DIR)/info.mk
192192
endef
193193

194+
ifdef CONFIG_GCC_USE_VERSION_12
195+
GCC_VERSION_FILE:=gcc/genversion.cc
196+
else
197+
GCC_VERSION_FILE:=gcc/version.c
198+
endif
199+
194200
ifneq ($(GCC_PREPARE),)
195201
define Host/Prepare
196202
$(call Host/SetToolchainInfo)
@@ -199,8 +205,7 @@ ifneq ($(GCC_PREPARE),)
199205
$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(HOST_SOURCE_DIR)/
200206
$(SED) 's,^MULTILIB_OSDIRNAMES,# MULTILIB_OSDIRNAMES,' $(HOST_SOURCE_DIR)/gcc/config/*/t-*
201207
$(SED) 'd' $(HOST_SOURCE_DIR)/gcc/DEV-PHASE
202-
$(SED) 's, DATESTAMP,,' $(HOST_SOURCE_DIR)/gcc/version.c
203-
#(cd $(HOST_SOURCE_DIR)/libstdc++-v3; autoconf;);
208+
$(SED) 's, DATESTAMP,,' $(HOST_SOURCE_DIR)/$(GCC_VERSION_FILE)
204209
$(SED) 's,gcc_no_link=yes,gcc_no_link=no,' $(HOST_SOURCE_DIR)/libstdc++-v3/configure
205210
mkdir -p $(GCC_BUILD_DIR)
206211
endef

0 commit comments

Comments
 (0)