Permalink
Browse files

Require C++14.

  • Loading branch information...
GabrielDosReis committed Jan 15, 2017
1 parent cea95f2 commit 7fab46eaa3de8e530863269556676e9de810758a
Showing with 15 additions and 12 deletions.
  1. +3 −3 config/open-axiom.m4
  2. +1 −1 configure
  3. +1 −1 configure.ac
  4. +2 −2 src/Makefile.am
  5. +2 −2 src/Makefile.in
  6. +2 −1 src/utils/Makefile.am
  7. +4 −2 src/utils/Makefile.in
View
@@ -256,11 +256,11 @@ esac
])
dnl -----------------------------
dnl -- OPENAXIOM_REQUIRE_CXX11 --
dnl -- OPENAXIOM_REQUIRE_CXX14 --
dnl -----------------------------
AC_DEFUN([OPENAXIOM_REQUIRE_CXX11],[
AC_DEFUN([OPENAXIOM_REQUIRE_CXX14],[
oa_saved_cxxflags=$CXXFLAGS
CXXFLAGS="-std=c++11"
CXXFLAGS="-std=c++14"
AC_MSG_CHECKING([whether $CXX supports $CXXFLAGS])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
[AC_MSG_RESULT([yes])]
View
@@ -5542,7 +5542,7 @@ fi
oa_saved_cxxflags=$CXXFLAGS
CXXFLAGS="-std=c++11"
CXXFLAGS="-std=c++14"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports $CXXFLAGS" >&5
$as_echo_n "checking whether $CXX supports $CXXFLAGS... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
View
@@ -91,7 +91,7 @@ AC_LANG([C++])
OPENAXIOM_HOST_COMPILERS
AM_CONDITIONAL([OA_USE_LLVM], [test -n $oa_use_llvm])
OPENAXIOM_REQUIRE_CXX11
OPENAXIOM_REQUIRE_CXX14
OPENAXIOM_EXTRA_CXX_OPTIONS
AM_CONDITIONAL([OA_BUILD_GCL], [test x$oa_include_gcl = xyes])
AM_CONDITIONAL([OA_ECL_RT], [test x$oa_lisp_flavor = xecl])
View
@@ -80,7 +80,7 @@ stamp-subdirs:
all-driver: all-utils all-lib
cd driver && $(MAKE) $(AM_MAKEFLAGS) $@
all-utils: stamp-subdirs all-headers
all-utils: stamp-subdirs all-lib
cd utils && $(MAKE) $(AM_MAKEFLAGS) $@
all-rt: all-utils
@@ -105,7 +105,7 @@ all-share:
all-doc: stamp-subdirs
cd doc && $(MAKE) $(AM_MAKEFLAGS) $@
all-lib: stamp-subdirs all-utils
all-lib: stamp-subdirs all-headers
cd lib && $(MAKE) $(AM_MAKEFLAGS) $@
all-lisp: all-lib all-driver
View
@@ -763,7 +763,7 @@ stamp-subdirs:
all-driver: all-utils all-lib
cd driver && $(MAKE) $(AM_MAKEFLAGS) $@
all-utils: stamp-subdirs all-headers
all-utils: stamp-subdirs all-lib
cd utils && $(MAKE) $(AM_MAKEFLAGS) $@
all-rt: all-utils
@@ -788,7 +788,7 @@ all-share:
all-doc: stamp-subdirs
cd doc && $(MAKE) $(AM_MAKEFLAGS) $@
all-lib: stamp-subdirs all-utils
all-lib: stamp-subdirs all-headers
cd lib && $(MAKE) $(AM_MAKEFLAGS) $@
all-lisp: all-lib all-driver
View
@@ -32,7 +32,8 @@
noinst_PROGRAMS = hammer$(EXEEXT)
hammer_SOURCES = hammer.cc
hammer_LDADD = \
$(oa_target_libdir)/libOpenAxiom.a
$(oa_target_libdir)/libOpenAxiom.a \
$(oa_target_libdir)/libopen-axiom-core.a
noinst_LIBRARIES = libOpenAxiom.a
View
@@ -152,7 +152,8 @@ libOpenAxiom_a_OBJECTS = $(am_libOpenAxiom_a_OBJECTS)
PROGRAMS = $(noinst_PROGRAMS)
am_hammer_OBJECTS = hammer.$(OBJEXT)
hammer_OBJECTS = $(am_hammer_OBJECTS)
hammer_DEPENDENCIES = $(oa_target_libdir)/libOpenAxiom.a
hammer_DEPENDENCIES = $(oa_target_libdir)/libOpenAxiom.a \
$(oa_target_libdir)/libopen-axiom-core.a
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
@@ -415,7 +416,8 @@ void_type = @void_type@
noinst_PROGRAMS = hammer$(EXEEXT)
hammer_SOURCES = hammer.cc
hammer_LDADD = \
$(oa_target_libdir)/libOpenAxiom.a
$(oa_target_libdir)/libOpenAxiom.a \
$(oa_target_libdir)/libopen-axiom-core.a
noinst_LIBRARIES = libOpenAxiom.a
libOpenAxiom_a_SOURCES = \

0 comments on commit 7fab46e

Please sign in to comment.