* config/var-def.mk (CPPFLAGS): New expanded variable.

	(LDFLAGS): Likewise.
	(COMPILE): Include CPPFLAGS.
	(CXXCOMPILE): Likewise.
	(LINK): Include LDFLAGS.
	(CXXLINK): Likewise.
	(CXXLINK_SHRLIB): New.
	* config/open-axiom.m4 (OPENAXIOM_HOST_DATA_PROPERTIES): Move
	ABI flags setting to OPENAXIOM_HOST_COMPILERS.  The CPPFLAGS and
	LDFLAGS instead of CFLAGS and CXXFLAGS.

2 files changed, 21 insertions, 17 deletions

diff --git a/config/open-axiom.m4 b/config/open-axiom.m4
index 1c9332ab..e868a77b 100644
--- a/config/open-axiom.m4
+++ b/config/open-axiom.m4
@@ -189,8 +189,19 @@ AC_DEFUN([OPENAXIOM_HOST_COMPILERS],[
 OPENAXIOM_PROG_LISP
 OPENAXIOM_LISP_FLAVOR($axiom_lisp)
 OPENAXIOM_REJECT_ROTTED_LISP($AXIOM_LISP)
+OPENAXIOM_HOST_LISP_CPU_PRECISION
 AC_PROG_CC
 AC_PROG_CXX
+## Augment C and C++ compiler flags with ABI directives as appropriate.
+case $GCC in
+  yes)
+    CPPFLAGS="$CPPFLAGS -m$openaxiom_host_lisp_precision"
+    LDFLAGS="$LDFLAGS -m$openaxiom_host_lisp_precision"
+    ;;
+  no)
+    # cross fingers and pray.
+    ;;
+esac
 OPENAXIOM_SATISFY_GCL_NEEDS
 AC_PROG_CPP
 ])
@@ -406,7 +417,6 @@ dnl ------------------------------------
 dnl -- OPENAXIOM_HOST_DATA_PROPERTIES --
 dnl ------------------------------------
 AC_DEFUN([OPENAXIOM_HOST_DATA_PROPERTIES],[
-OPENAXIOM_HOST_LISP_CPU_PRECISION
 ## Byte order of the host.
 AC_C_BIGENDIAN
 AC_CHECK_HEADERS([stdint.h inttypes.h])
@@ -421,15 +431,4 @@ fi
 AC_DEFINE_UNQUOTED([OPENAXIOM_HOST_LISP_PRECISION],
                    [$openaxiom_host_lisp_precision],
                    [The width of the host Lisp and CPU registers.])
-
-## Augment compiler flags with ABI directives as appropriate.
-case $GCC in
-  yes)
-    CFLAGS="$CFLAGS -m$openaxiom_host_lisp_precision"
-    CXXFLAGS="$CXXFLAGS -m$openaxiom_host_lisp_precision"
-    ;;
-  no)
-    # cross fingers and pray.
-    ;;
-esac
 ])
diff --git a/config/var-def.mk b/config/var-def.mk
index 6de145ed..89c03c29 100644
--- a/config/var-def.mk
+++ b/config/var-def.mk
@@ -53,7 +53,10 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 
 AR = @AR@
 CC = @CC@
+CPPFLAGS = @CPPFLAGS@
 CFLAGS = @CFLAGS@
+CXXFLAGS = @CXXFLAGS@
+LDFLAGS = @LDFLAGS@
 OBJEXT = @OBJEXT@
 EXEEXT = @EXEEXT@
 # this includes leading period
@@ -67,15 +70,15 @@ LIBTOOL_DEPS = @LIBTOOL_DEPS@
 LIBTOOL = $(top_builddir)/libtool
 
 ## Command used to compile a C program 
-COMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) -c
-CXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) -c
+COMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) -c $(CPPFLAGS)
+CXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) -c $(CPPFLAGS)
 
 ## Sadly, at the moment, the C parts of the OpenAxiom system is not
 ## well structured enough to allow for clean dynamic libraries
 ## and dynamic linking.  So, we build static programs.
 ## This situation is to be fixed when I have time.
-LINK = $(LIBTOOL) --mode=link $(CC) -static
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXX) -static
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CC) -static $(LDFLAGS)
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXX) -static $(LDFLAGS)
 
 ## Libtool is a disaster for building DLLs on Cygwin, and insists
 ## on adding silly extensions where it should not on MinGW, so we have
@@ -83,8 +86,10 @@ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXX) -static
 ## up negating the whole point of having Libtool in the first place.
 ifeq (@oa_use_libtool_for_shared_lib@,no)
 LINK_SHRLIB = $(CC)
+CXXLINK_SHRLIB = $(CXX)
 else
-LINK_SHRLIB = $(LIBTOOL) --mode=link $(CC)
+LINK_SHRLIB = $(LIBTOOL) --tag=CC --mode=link $(CC)
+CXXLINK_SHRLIB = $(LIBTOOL) --tag=CXX --mode=link $(CC)
 endif