glibc: move autoconf cache variables to GLIBC_CONF_ENV
authorThomas Petazzoni <thomas.petazzoni@bootlin.com>
Sun, 23 Sep 2018 20:54:57 +0000 (22:54 +0200)
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>
Sun, 23 Sep 2018 21:42:41 +0000 (23:42 +0200)
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>
package/glibc/glibc.mk

index a2eb8714b198d92f9dabb5956f7443d7b7186eb4..4e50f5aa0c9f217e4b1e2d0355693d09cf2981d7 100644 (file)
@@ -71,6 +71,11 @@ define GLIBC_ADD_MISSING_STUB_H
 endef
 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
 # override the default configure commands for several reasons:
 #
@@ -89,10 +94,8 @@ define GLIBC_CONFIGURE_CMDS
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" CPPFLAGS="" \
                CXXFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" \
+               $(GLIBC_CONF_ENV) \
                $(SHELL) $(@D)/configure \
-               ac_cv_path_BASH_SHELL=/bin/bash \
-               libc_cv_forced_unwind=yes \
-               libc_cv_ssp=no \
                --target=$(GNU_TARGET_NAME) \
                --host=$(GNU_TARGET_NAME) \
                --build=$(GNU_HOST_NAME) \