diff options
| author | Andres Noetzli <andres.noetzli@gmail.com> | 2017-07-16 12:22:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-16 12:22:32 -0400 |
| commit | 28693db66c42bf48b9d748aba869d4fe149b6b44 (patch) | |
| tree | 0cae2401999b8ed00a68255de210ec700bf841d0 | |
| parent | 9197b224c797df44753612efb0d52087789ec772 (diff) | |
Use CXXFLAGS when compiling parsers (#197)
ANTLR generates C files that we compile with the C++ compiler.
To do so, we set CC=CXX in the `Makefile.am`s of the parsers.
Previously, we did not copy the CXXFLAGS to the CFLAGS, which
could result in problems, e.g. when using -std=gnu++11 in the
CXXFLAGS, compiling the parsers would fail if they used C++11
features (configure.ac usually modifies CXX to include the
-std=gnu++11 flag but if it is included in CXXFLAGS, the CXX
is not changed).
| -rw-r--r-- | src/parser/cvc/Makefile.am | 3 | ||||
| -rw-r--r-- | src/parser/smt1/Makefile.am | 1 | ||||
| -rw-r--r-- | src/parser/smt2/Makefile.am | 1 | ||||
| -rw-r--r-- | src/parser/tptp/Makefile.am | 1 |
4 files changed, 5 insertions, 1 deletions
diff --git a/src/parser/cvc/Makefile.am b/src/parser/cvc/Makefile.am index 8f084ba34..ff3308d89 100644 --- a/src/parser/cvc/Makefile.am +++ b/src/parser/cvc/Makefile.am @@ -4,8 +4,9 @@ AM_CPPFLAGS = \ AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) $(WNO_PARENTHESES) $(WNO_TAUTOLOGICAL_COMPARE) -Wno-unused-function -Wno-unused-variable $(WNO_UNINITIALIZED) $(WNO_CONVERSION_NULL) # Compile generated C files using C++ compiler -CC=$(CXX) AM_CFLAGS = $(AM_CXXFLAGS) +CFLAGS=$(CXXFLAGS) +CC=$(CXX) ANTLR_OPTS = diff --git a/src/parser/smt1/Makefile.am b/src/parser/smt1/Makefile.am index ae49d0659..f5320002d 100644 --- a/src/parser/smt1/Makefile.am +++ b/src/parser/smt1/Makefile.am @@ -5,6 +5,7 @@ AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) $(WNO_PARENTH # Compile generated C files using C++ compiler AM_CFLAGS = $(AM_CXXFLAGS) +CFLAGS=$(CXXFLAGS) CC=$(CXX) ANTLR_OPTS = diff --git a/src/parser/smt2/Makefile.am b/src/parser/smt2/Makefile.am index fece5e5e8..995e442e6 100644 --- a/src/parser/smt2/Makefile.am +++ b/src/parser/smt2/Makefile.am @@ -5,6 +5,7 @@ AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) $(WNO_PARENTH # Compile generated C files using C++ compiler AM_CFLAGS = $(AM_CXXFLAGS) +CFLAGS=$(CXXFLAGS) CC=$(CXX) ANTLR_OPTS = diff --git a/src/parser/tptp/Makefile.am b/src/parser/tptp/Makefile.am index eab01103f..43bbc595d 100644 --- a/src/parser/tptp/Makefile.am +++ b/src/parser/tptp/Makefile.am @@ -5,6 +5,7 @@ AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) $(WNO_PARENTH # Compile generated C files using C++ compiler AM_CFLAGS = $(AM_CXXFLAGS) +CFLAGS=$(CXXFLAGS) CC=$(CXX) ANTLR_OPTS = |