Browse Source

glibc: move autoconf cache variables to GLIBC_CONF_ENV

glibc is not using the autotools-package infrastructure, so we are
calling the ./configure script manually. Currently, the few autoconf
cache variables are passed as arguments to the ./configure script,
while we pass them through the environment in the autotools-package
infrastructure.

So let's pass them in the environment, and use a GLIBC_CONF_ENV
variable to store them. This will allow in a follow-up commit to
conditionally add more autoconf cache variables to the glibc build.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Thomas Petazzoni 6 years ago
parent
commit
03e2bad868
1 changed files with 6 additions and 3 deletions
  1. 6 3
      package/glibc/glibc.mk

+ 6 - 3
package/glibc/glibc.mk

@@ -71,6 +71,11 @@ define GLIBC_ADD_MISSING_STUB_H
 endef
 endef
 endif
 endif
 
 
+GLIBC_CONF_ENV = \
+	ac_cv_path_BASH_SHELL=/bin/bash \
+	libc_cv_forced_unwind=yes \
+	libc_cv_ssp=no
+
 # Even though we use the autotools-package infrastructure, we have to
 # Even though we use the autotools-package infrastructure, we have to
 # override the default configure commands for several reasons:
 # override the default configure commands for several reasons:
 #
 #
@@ -89,10 +94,8 @@ define GLIBC_CONFIGURE_CMDS
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" CPPFLAGS="" \
 		CFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" CPPFLAGS="" \
 		CXXFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" \
 		CXXFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" \
+		$(GLIBC_CONF_ENV) \
 		$(SHELL) $(@D)/configure \
 		$(SHELL) $(@D)/configure \
-		ac_cv_path_BASH_SHELL=/bin/bash \
-		libc_cv_forced_unwind=yes \
-		libc_cv_ssp=no \
 		--target=$(GNU_TARGET_NAME) \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
 		--build=$(GNU_HOST_NAME) \