diff options
| author | dos-reis <gdr@axiomatics.org> | 2013-04-03 02:16:23 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2013-04-03 02:16:23 +0000 |
| commit | e54671b3aa34f350c009c407042933b814fe220f (patch) | |
| tree | c06d393ed2395071d714fe3062f086c758f7d993 /config | |
| parent | 1e979a3c60f7e79ee8aa3aef8f9d4bb354b17bc1 (diff) | |
| download | open-axiom-e54671b3aa34f350c009c407042933b814fe220f.tar.gz | |
Fix up fallout from C++11 switch
Diffstat (limited to 'config')
| -rw-r--r-- | config/open-axiom.m4 | 2 | ||||
| -rw-r--r-- | config/var-def.mk | 4 |
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 |