diff options
| author | wushin <pasekei@gmail.com> | 2015-05-24 19:13:09 -0500 |
|---|---|---|
| committer | wushin <pasekei@gmail.com> | 2015-05-25 14:19:41 -0500 |
| commit | 097e924102d7f9de5fed7c7bc537e378b72a6340 (patch) | |
| tree | 1e4253b8fdc8af44fae16aafea0784fd08c6afc4 | |
| parent | b8519f9aa5ecd6cad984d53b27269ae9dec37b47 (diff) | |
| download | tmwa-097e924102d7f9de5fed7c7bc537e378b72a6340.tar.gz tmwa-097e924102d7f9de5fed7c7bc537e378b72a6340.tar.bz2 tmwa-097e924102d7f9de5fed7c7bc537e378b72a6340.tar.xz tmwa-097e924102d7f9de5fed7c7bc537e378b72a6340.zip | |
Fix fabi gcc travis
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | Makefile.in | 6 | ||||
| -rwxr-xr-x | configure | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index bebade1..accc0ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,8 +57,8 @@ script: - mkdir build - cd build - git init - - echo ../configure --build=x86_64-linux-gnu --dev CPPFLAGS=-DQUIET `! [[ $CXX =~ clang* ]] || echo --disable-abi6` $EXTRA_CONFIGURE_ARGS - - ../configure --build=x86_64-linux-gnu --dev CPPFLAGS=-DQUIET `! [[ $CXX =~ clang* ]] || echo --disable-abi6` $EXTRA_CONFIGURE_ARGS + - echo ../configure --build=x86_64-linux-gnu --dev CPPFLAGS=-DQUIET `! [[ $CXX =~ clang* ]] || echo --disable-abi` $EXTRA_CONFIGURE_ARGS + - ../configure --build=x86_64-linux-gnu --dev CPPFLAGS=-DQUIET `! [[ $CXX =~ clang* ]] || echo --disable-abi` $EXTRA_CONFIGURE_ARGS - make -R -k -j2 - make -R -k -j2 test TESTER='valgrind --error-exitcode=1 --track-fds=yes' @@ -103,7 +103,7 @@ matrix: - compiler: gcc env: REAL_CC=gcc-4.9 REAL_CXX=g++-4.9 PPA=ppa:ubuntu-toolchain-r/test PACKAGE=g++-4.9 DEBUGPACKAGE=libstdc++6-4.9-dbg - compiler: gcc - env: REAL_CC=gcc-5 REAL_CXX=g++-5 PPA=ppa:ubuntu-toolchain-r/test PACKAGE=g++-5 DEBUGPACKAGE=libstdc++6-4.9-dbg + env: REAL_CC=gcc-5 REAL_CXX=g++-5 PPA=ppa:ubuntu-toolchain-r/test PACKAGE=g++-5 DEBUGPACKAGE=libstdc++6-5-dbg - compiler: gcc env: REAL_CC=gcc-4.7 REAL_CXX=g++-4.7 PPA=ppa:ubuntu-toolchain-r/test PACKAGE=g++-4.7 DEBUGPACKAGE=libstdc++6-4.8-dbg EXTRA_CONFIGURE_ARGS=--disable-warnings diff --git a/Makefile.in b/Makefile.in index 006594a..779ca04 100644 --- a/Makefile.in +++ b/Makefile.in @@ -47,7 +47,7 @@ GTEST_DIR = @GTEST_DIR@ GDB = @GDB@ ENABLE_WARNINGS = @ENABLE_WARNINGS@ -ENABLE_ABI6 = @ENABLE_ABI6@ +ENABLE_ABI = @ENABLE_ABI@ ENABLE_CYGWIN_HACKS = @ENABLE_CYGWIN_HACKS@ ENABLE_DEBUG = @ENABLE_DEBUG@ ENABLE_RPATH = @ENABLE_RPATH@ @@ -276,8 +276,8 @@ WARNINGS := -include ${SRC_DIR}/src/warnings.hpp endif # related to gdb bug 15801 -ifeq (${ENABLE_ABI6},yes) -CXXFLAGS += -fabi-version=6 +ifeq (${ENABLE_ABI},yes) +CXXFLAGS += -fabi-version=8 endif # This needs to edit CXX instead of CXXFLAGS in order to make @@ -50,7 +50,7 @@ class Configuration(Cxx, Install, ConfigHash, Templates): home = os.path.expanduser('~') self.add_alias('--user', ['--prefix=%s' % home, '--enable-rpath=relative'], help='alias for --prefix=$HOME --enable-rpath=relative', hidden=False) - self.add_alias('--dev', ['--user', '--enable-warnings', '--enable-abi6'], + self.add_alias('--dev', ['--user', '--enable-warnings', '--enable-abi'], help=None, hidden=False) def paths(self): @@ -66,8 +66,8 @@ class Configuration(Cxx, Install, ConfigHash, Templates): self.add_bool_feature('warnings', init='no', check=lambda build, ENABLE_WARNINGS: None, help='Enable warnings (for development)') - self.add_bool_feature('abi6', init='no', - check=lambda build, ENABLE_ABI6: None, + self.add_bool_feature('abi', init='no', + check=lambda build, ENABLE_ABI: None, help='Force a nonbuggy gcc ABI (for development)') self.add_bool_feature('cygwin-hacks', init='no', check=lambda build, ENABLE_CYGWIN_HACKS: None, |