diff options
| author | Lubos Lunak <l.lunak@suse.cz> | 2012-10-19 13:33:13 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-10-22 14:56:20 +0200 |
| commit | 3c00ff3a4501d1b4164373c5f6e15b464df6854b (patch) | |
| tree | aee89f2627402276d302ca724267bcdbaa88b778 /config_host.mk.in | |
| parent | 156c18ad56df7ddae96330a89940c869583bb04f (diff) | |
make configure remember C/CXX/OBJC/OBJCXX/LDFLAGS if explicitly passed to it
If not, the build system selects the right flags depending on --enable-debug
etc. , but e.g. packagers may want to do builds with e.g. both -O and -g.
This is also reasonably close to what autotools do, except that there configure
forces -g -O2 if nothing is explicitly given.
Change-Id: I1889569177ad3cbd6decdc7e9986f67ef5d4456a
Diffstat (limited to 'config_host.mk.in')
| -rw-r--r-- | config_host.mk.in | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 8708ac842f8a..91acee5680b6 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -55,6 +55,9 @@ export CC_FOR_BUILD=@CC_FOR_BUILD@ export CDR_CFLAGS=@CDR_CFLAGS@ export CDR_LIBS=@CDR_LIBS@ export CDR_TARBALL=@CDR_TARBALL@ +ifneq ($(strip @CFLAGS@),) +export CFLAGS=@CFLAGS@ +endif export CHECK_PARALLELISM=@CHECK_PARALLELISM@ export CLASSPATH=@CLASSPATH@ export CLUCENE_CFLAGS=@CLUCENE_CFLAGS@ @@ -86,6 +89,9 @@ export CURL_LIBS=@CURL_LIBS@ export CXX=@CXX@ export CXX_FOR_BUILD=@CXX_FOR_BUILD@ export CXX_X64_BINARY=@CXX_X64_BINARY@ +ifneq ($(strip @CXXFLAGS@),) +export CXXFLAGS=@CXXFLAGS@ +endif export DATADIR=@DATADIR@ export DBGHELP_DLL=@DBGHELP_DLL@ export DBUSMENUGTK_CFLAGS=@DBUSMENUGTK_CFLAGS@ @@ -301,6 +307,9 @@ export LANGUAGETOOL_TARBALL=@LANGUAGETOOL_TARBALL@ export L10N_MODULE=@L10N_MODULE@ export LCMS2_CFLAGS=@LCMS2_CFLAGS@ export LCMS2_LIBS=@LCMS2_LIBS@ +ifneq ($(strip @LDFLAGS@),) +export LDFLAGS=@LDFLAGS@ +endif export LFS_CFLAGS=@LFS_CFLAGS@ export LIBBASE_JAR=@LIBBASE_JAR@ export LIBDIR=@LIBDIR@ @@ -430,6 +439,12 @@ export nodep=@nodep@ export NSS_CFLAGS=@NSS_CFLAGS@ export NSS_LIBS=@NSS_LIBS@ export NUMBERTEXT_EXTENSION_PACK=@NUMBERTEXT_EXTENSION_PACK@ +ifneq ($(strip @OBJCFLAGS@),) +export OBJCFLAGS=@OBJCFLAGS@ +endif +ifneq ($(strip @OBJCXXFLAGS@),) +export OBJCXXFLAGS=@OBJCXXFLAGS@ +endif export OBJDUMP=@OBJDUMP@ export OOOBLOGGER_EXTENSION_PACK=@OOOBLOGGER_EXTENSION_PACK@ export OOODMAKEMODE=YES |