summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Liddell <chris.liddell@artifex.com>2016-06-22 18:51:50 +0100
committerChris Liddell <chris.liddell@artifex.com>2016-10-21 15:15:09 +0100
commitb5605797a3fcc8c3a8e1aaa1625a74fdf97a2725 (patch)
treef10c12aea383434e256be0fe3c38c7a30798cba1
parent60b9e7c3df25b2ce05c8cef00cd2d85946186666 (diff)
downloadghostpdl-b5605797a3fcc8c3a8e1aaa1625a74fdf97a2725.tar.gz
Handle CFLAGSAUX and LDFLAGSAUX slightly better
If we are cross compiling, allow CFLAGSAUX and LDFLAGSAUX to be set independently of CFLAGS and LDFLAGS, but if they are not set, leave configure to find reasonable defaults. If we are not cross compiling, also allow CFLAGSAUX and LDFLAGSAUX to be set independently, but if they are not, default to using the same values as CFLAGS and LDFLAGS.
-rw-r--r--configure.ac12
1 files changed, 7 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 9f87df979..132d895e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,11 +30,13 @@ CPPFLAGS="${CPPFLAGS:=}"
CXXFLAGS="${CXXFLAGS:=}"
LDFLAGS="${LDFLAGS:=}"
-CFLAGSAUX="${CFLAGSAUX:-$CFLAGS}"
-LDFLAGSAUX="${LDFLAGSAUX:-$LDFLAGS}"
-
-# save these for later
-OPARMS=$@
+if test x"$cross_compiling" = x"yes"; then
+ CFLAGSAUX="${CFLAGSAUX:=}"
+ LDFLAGSAUX="${LDFLAGSAUX:=}"
+else
+ CFLAGSAUX="${CFLAGSAUX:-$CFLAGS}"
+ LDFLAGSAUX="${LDFLAGSAUX:-$LDFLAGS}"
+fi
THEMAKEFILE="${MAKEFILE:-Makefile}"
AUXFLAGS_MAK=auxflags.mak