Skip to content

Commit bf91381

Browse files
committed
Revert "toolchain: gcc: make config consistent with glibc/musl"
This reverts commit 57841c8. 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>
1 parent c8839fa commit bf91381

File tree

4 files changed

+5
-29
lines changed

4 files changed

+5
-29
lines changed

toolchain/gcc/common.mk

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,6 @@ else
8989
GRAPHITE_CONFIGURE:= --without-isl --without-cloog
9090
endif
9191

92-
## sane and common defaults for different libc implementations
93-
export lt_cv_prog_compiler_static_works=yes
94-
export lt_cv_prog_compiler_static_works_CXX=yes
95-
export lt_cv_sys_max_cmd_len=1572864
96-
97-
GCC_CONFIGURE_VARS :=
98-
9992
GCC_CONFIGURE:= \
10093
SHELL="$(BASH)" \
10194
$(HOST_SOURCE_DIR)/configure \
@@ -229,7 +222,6 @@ endif
229222

230223
define Host/Configure
231224
(cd $(GCC_BUILD_DIR) && rm -f config.cache; \
232-
$(if $(strip $(GCC_CONFIGURE_VARS)),export $(GCC_CONFIGURE_VARS)); \
233225
$(GCC_CONFIGURE) \
234226
);
235227
endef

toolchain/gcc/final/Makefile

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ifndef CONFIG_USE_GLIBC
1717
endif
1818

1919
ifdef CONFIG_USE_MUSL
20-
GCC_CONFIGURE_VARS += gcc_cv_libc_provides_ssp=yes
20+
GCC_MAKE += gcc_cv_libc_provides_ssp=yes
2121
endif
2222

2323
ifneq ($(CONFIG_SJLJ_EXCEPTIONS),)
@@ -39,7 +39,6 @@ define Host/Configure
3939
$(CleanupToolchain)
4040
mkdir -p $(GCC_BUILD_DIR)
4141
(cd $(GCC_BUILD_DIR) && rm -f config.cache; \
42-
$(if $(strip $(GCC_CONFIGURE_VARS)),export $(GCC_CONFIGURE_VARS)); \
4342
$(GCC_CONFIGURE) \
4443
);
4544
endef
@@ -54,10 +53,7 @@ endif
5453

5554
define Host/Compile
5655
$(FixGogccCrt)
57-
58-
$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) \
59-
$(GCC_CONFIGURE_VARS) \
60-
all
56+
+$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) all
6157
endef
6258

6359
define SetupExtraArch
@@ -75,11 +71,7 @@ endef
7571

7672
define Host/Install
7773
$(CleanupToolchain)
78-
79-
+$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) \
80-
$(GCC_CONFIGURE_VARS) \
81-
install
82-
74+
+$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) install
8375
# Set up the symlinks to enable lying about target name.
8476
set -e; \
8577
(cd $(TOOLCHAIN_DIR); \

toolchain/gcc/initial/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,13 @@ GCC_CONFIGURE += \
1212

1313
define Host/Compile
1414
+$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) \
15-
$(GCC_CONFIGURE_VARS) \
1615
all-build-libiberty \
1716
all-gcc \
1817
all-target-libgcc
1918
endef
2019

2120
define Host/Install
2221
+$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) \
23-
$(GCC_CONFIGURE_VARS) \
2422
install-gcc \
2523
install-target-libgcc
2624

toolchain/gcc/minimal/Makefile

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,11 @@ GCC_CONFIGURE += \
1313
--disable-threads
1414

1515
define Host/Compile
16-
+$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) \
17-
$(GCC_CONFIGURE_VARS) \
18-
all-gcc \
19-
all-target-libgcc
16+
+$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) all-gcc all-target-libgcc
2017
endef
2118

2219
define Host/Install
23-
$(GCC_MAKE) -C $(GCC_BUILD_DIR) \
24-
$(GCC_CONFIGURE_VARS) \
25-
install-gcc \
26-
install-target-libgcc
20+
$(GCC_MAKE) -C $(GCC_BUILD_DIR) install-gcc install-target-libgcc
2721
endef
2822

2923
define Host/Clean

0 commit comments

Comments
 (0)