aboutsummaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/open-axiom.m42
-rw-r--r--config/var-def.mk4
2 files changed, 3 insertions, 3 deletions
diff --git a/config/open-axiom.m4 b/config/open-axiom.m4
index 842e3682..2cc42d54 100644
--- a/config/open-axiom.m4
+++ b/config/open-axiom.m4
@@ -172,7 +172,7 @@ fi
AC_MSG_RESULT([$axiom_lisp_flavor])
AC_DEFINE_UNQUOTED([OPENAXIOM_BASE_RTS],
- [${axiom_lisp_flavor}_runtime],
+ [Runtime::${axiom_lisp_flavor}],
[The kind of base runtime system for this build.])
])
diff --git a/config/var-def.mk b/config/var-def.mk
index 11e0ebd9..b89d3c88 100644
--- a/config/var-def.mk
+++ b/config/var-def.mk
@@ -72,8 +72,8 @@ LIBTOOL_DEPS = @LIBTOOL_DEPS@
LIBTOOL = $(top_builddir)/libtool
## Command used to compile a C program
-COMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) -c $(CPPFLAGS)
-CXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) -c $(CPPFLAGS)
+COMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS)
+CXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS)
## Sadly, at the moment, the C parts of the OpenAxiom system is not
## well structured enough to allow for clean dynamic libraries