diff options
| author | Robert Marko | 2025-05-02 17:30:47 +0000 |
|---|---|---|
| committer | Robert Marko | 2025-05-02 17:30:47 +0000 |
| commit | bf9138145106f91a5b367f9ac2bf43582e92f9c1 (patch) | |
| tree | cf5ba7c820a62b77fa59e8878168382f107b85b0 | |
| parent | c8839fa6f4f32348543e3132639c241ed91a73ba (diff) | |
| download | openwrt-bf9138145106f91a5b367f9ac2bf43582e92f9c1.tar.gz | |
Revert "toolchain: gcc: make config consistent with glibc/musl"
This reverts commit 57841c83d9c1503a19212766639d17ae5019bb8c.
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>
| -rw-r--r-- | toolchain/gcc/common.mk | 8 | ||||
| -rw-r--r-- | toolchain/gcc/final/Makefile | 14 | ||||
| -rw-r--r-- | toolchain/gcc/initial/Makefile | 2 | ||||
| -rw-r--r-- | toolchain/gcc/minimal/Makefile | 10 |
4 files changed, 5 insertions, 29 deletions
diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk index a5837493c2..0ccf55bd31 100644 --- a/toolchain/gcc/common.mk +++ b/toolchain/gcc/common.mk @@ -89,13 +89,6 @@ else GRAPHITE_CONFIGURE:= --without-isl --without-cloog 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:= \ SHELL="$(BASH)" \ $(HOST_SOURCE_DIR)/configure \ @@ -229,7 +222,6 @@ endif define Host/Configure (cd $(GCC_BUILD_DIR) && rm -f config.cache; \ - $(if $(strip $(GCC_CONFIGURE_VARS)),export $(GCC_CONFIGURE_VARS)); \ $(GCC_CONFIGURE) \ ); endef diff --git a/toolchain/gcc/final/Makefile b/toolchain/gcc/final/Makefile index 6a190a14d7..78a5576bff 100644 --- a/toolchain/gcc/final/Makefile +++ b/toolchain/gcc/final/Makefile @@ -17,7 +17,7 @@ ifndef CONFIG_USE_GLIBC endif ifdef CONFIG_USE_MUSL - GCC_CONFIGURE_VARS += gcc_cv_libc_provides_ssp=yes + GCC_MAKE += gcc_cv_libc_provides_ssp=yes endif ifneq ($(CONFIG_SJLJ_EXCEPTIONS),) @@ -39,7 +39,6 @@ define Host/Configure $(CleanupToolchain) mkdir -p $(GCC_BUILD_DIR) (cd $(GCC_BUILD_DIR) && rm -f config.cache; \ - $(if $(strip $(GCC_CONFIGURE_VARS)),export $(GCC_CONFIGURE_VARS)); \ $(GCC_CONFIGURE) \ ); endef @@ -54,10 +53,7 @@ endif define Host/Compile $(FixGogccCrt) - - $(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) \ - $(GCC_CONFIGURE_VARS) \ - all + +$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) all endef define SetupExtraArch @@ -75,11 +71,7 @@ endef define Host/Install $(CleanupToolchain) - - +$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) \ - $(GCC_CONFIGURE_VARS) \ - install - + +$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) install # Set up the symlinks to enable lying about target name. set -e; \ (cd $(TOOLCHAIN_DIR); \ diff --git a/toolchain/gcc/initial/Makefile b/toolchain/gcc/initial/Makefile index 6b8a66798b..7cb4a73dbc 100644 --- a/toolchain/gcc/initial/Makefile +++ b/toolchain/gcc/initial/Makefile @@ -12,7 +12,6 @@ GCC_CONFIGURE += \ define Host/Compile +$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) \ - $(GCC_CONFIGURE_VARS) \ all-build-libiberty \ all-gcc \ all-target-libgcc @@ -20,7 +19,6 @@ endef define Host/Install +$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) \ - $(GCC_CONFIGURE_VARS) \ install-gcc \ install-target-libgcc diff --git a/toolchain/gcc/minimal/Makefile b/toolchain/gcc/minimal/Makefile index 83c17c8823..31d6f675ab 100644 --- a/toolchain/gcc/minimal/Makefile +++ b/toolchain/gcc/minimal/Makefile @@ -13,17 +13,11 @@ GCC_CONFIGURE += \ --disable-threads define Host/Compile - +$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) \ - $(GCC_CONFIGURE_VARS) \ - all-gcc \ - all-target-libgcc + +$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) all-gcc all-target-libgcc endef define Host/Install - $(GCC_MAKE) -C $(GCC_BUILD_DIR) \ - $(GCC_CONFIGURE_VARS) \ - install-gcc \ - install-target-libgcc + $(GCC_MAKE) -C $(GCC_BUILD_DIR) install-gcc install-target-libgcc endef define Host/Clean |