From 6842d7ffb4ed409a276f9e06a8e5310ad7d5764f Mon Sep 17 00:00:00 2001 From: Adam Stevko Date: Thu, 25 Jul 2013 18:20:27 +0200 Subject: [PATCH] 2682 Supply CC, CXX, CFLAGS, LDFLAGS etc to CONFIGURE_ENV by default --- make-rules/configure.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/make-rules/configure.mk b/make-rules/configure.mk index 9b643c699a0..5a0e95f3996 100644 --- a/make-rules/configure.mk +++ b/make-rules/configure.mk @@ -70,11 +70,17 @@ CONFIGURE_INFODIR = /usr/share/info CONFIGURE_INCLUDEDIR = /usr/include CONFIGURE_ENV = CONFIG_SHELL="$(CONFIG_SHELL)" +CONFIGURE_ENV += CC="$(CC)" +CONFIGURE_ENV += CXX="$(CXX)" +CONFIGURE_ENV += CFLAGS="$(CFLAGS)" +CONFIGURE_ENV += CXXFLAGS="$(CXXFLAGS)" +CONFIGURE_ENV += LDFLAGS="$(LDFLAGS)" +CONFIGURE_ENV += PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" CONFIGURE_DEFAULT_DIRS?=yes -CONFIGURE_OPTIONS += CC="$(CC)" -CONFIGURE_OPTIONS += CXX="$(CXX)" +#CONFIGURE_OPTIONS += CC="$(CC)" +#CONFIGURE_OPTIONS += CXX="$(CXX)" CONFIGURE_OPTIONS += --prefix=$(CONFIGURE_PREFIX) ifeq ($(CONFIGURE_DEFAULT_DIRS),yes) CONFIGURE_OPTIONS += --mandir=$(CONFIGURE_MANDIR)