OpenWrt/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-08-12 22:26:10 +08:00
Code Releases Activity

Revert "toolchain: gcc: make config consistent with glibc/musl"

Browse Source 
This reverts commit 57841c83d9.

This is completely breaking the inital GCC configuration and most likely
was not even compile tested, so revert until fixed.

Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Robert Marko
2025-05-02 19:30:47 +02:00
parent c8839fa6f4
commit bf91381451
4 changed files with 5 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
toolchain/gcc/common.mk
View File

@ -89,13 +89,6 @@ else
GRAPHITE_CONFIGURE:= --without-isl --without-cloog GRAPHITE_CONFIGURE:= --without-isl --without-cloog
endif endif
## sane and common defaults for different libc implementations
export lt_cv_prog_compiler_static_works=yes
export lt_cv_prog_compiler_static_works_CXX=yes
export lt_cv_sys_max_cmd_len=1572864
GCC_CONFIGURE_VARS :=
GCC_CONFIGURE:= \ GCC_CONFIGURE:= \
SHELL="$(BASH)" \ SHELL="$(BASH)" \
$(HOST_SOURCE_DIR)/configure \ $(HOST_SOURCE_DIR)/configure \
@ -229,7 +222,6 @@ endif
define Host/Configure define Host/Configure
(cd $(GCC_BUILD_DIR) && rm -f config.cache; \ (cd $(GCC_BUILD_DIR) && rm -f config.cache; \
$(if $(strip $(GCC_CONFIGURE_VARS)),export $(GCC_CONFIGURE_VARS)); \
$(GCC_CONFIGURE) \ $(GCC_CONFIGURE) \
); );
endef endef

14
toolchain/gcc/final/Makefile
View File

@ -17,7 +17,7 @@ ifndef CONFIG_USE_GLIBC
endif endif
ifdef CONFIG_USE_MUSL ifdef CONFIG_USE_MUSL
GCC_CONFIGURE_VARS += gcc_cv_libc_provides_ssp=yes GCC_MAKE += gcc_cv_libc_provides_ssp=yes
endif endif
ifneq ($(CONFIG_SJLJ_EXCEPTIONS),) ifneq ($(CONFIG_SJLJ_EXCEPTIONS),)
@ -39,7 +39,6 @@ define Host/Configure
$(CleanupToolchain) $(CleanupToolchain)
mkdir -p $(GCC_BUILD_DIR) mkdir -p $(GCC_BUILD_DIR)
(cd $(GCC_BUILD_DIR) && rm -f config.cache; \ (cd $(GCC_BUILD_DIR) && rm -f config.cache; \
$(if $(strip $(GCC_CONFIGURE_VARS)),export $(GCC_CONFIGURE_VARS)); \
$(GCC_CONFIGURE) \ $(GCC_CONFIGURE) \
); );
endef endef
@ -54,10 +53,7 @@ endif
define Host/Compile define Host/Compile
$(FixGogccCrt) $(FixGogccCrt)
+$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) all
$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) \
$(GCC_CONFIGURE_VARS) \
all
endef endef
define SetupExtraArch define SetupExtraArch
@ -75,11 +71,7 @@ endef
define Host/Install define Host/Install
$(CleanupToolchain) $(CleanupToolchain)
+$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) install
+$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) \
$(GCC_CONFIGURE_VARS) \
install
# Set up the symlinks to enable lying about target name. # Set up the symlinks to enable lying about target name.
set -e; \ set -e; \
(cd $(TOOLCHAIN_DIR); \ (cd $(TOOLCHAIN_DIR); \

2
toolchain/gcc/initial/Makefile
View File

@ -12,7 +12,6 @@ GCC_CONFIGURE += \
define Host/Compile define Host/Compile
+$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) \ +$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) \
$(GCC_CONFIGURE_VARS) \
all-build-libiberty \ all-build-libiberty \
all-gcc \ all-gcc \
all-target-libgcc all-target-libgcc
@ -20,7 +19,6 @@ endef
define Host/Install define Host/Install
+$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) \ +$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) \
$(GCC_CONFIGURE_VARS) \
install-gcc \ install-gcc \
install-target-libgcc install-target-libgcc

10
toolchain/gcc/minimal/Makefile
View File

@ -13,17 +13,11 @@ GCC_CONFIGURE += \
--disable-threads --disable-threads
define Host/Compile define Host/Compile
+$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) \ +$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) all-gcc all-target-libgcc
$(GCC_CONFIGURE_VARS) \
all-gcc \
all-target-libgcc
endef endef
define Host/Install define Host/Install
$(GCC_MAKE) -C $(GCC_BUILD_DIR) \ $(GCC_MAKE) -C $(GCC_BUILD_DIR) install-gcc install-target-libgcc
$(GCC_CONFIGURE_VARS) \
install-gcc \
install-target-libgcc
endef endef
define Host/Clean define Host/Clean