diff options
| author | gumi <git@gumi.ca> | 2018-03-05 21:30:03 -0500 |
|---|---|---|
| committer | gumi <git@gumi.ca> | 2018-03-05 21:31:09 -0500 |
| commit | 90ec23d0cedd0df4b5ad1fbb6af23fffb197d1b1 (patch) | |
| tree | 8ff3d004e0b3c051bb490443ec75be3eea738e31 | |
| parent | dba5f50ff79d78eb30d75eb27ad5a0dba30162dc (diff) | |
| download | tmwa-90ec23d0cedd0df4b5ad1fbb6af23fffb197d1b1.tar.gz tmwa-90ec23d0cedd0df4b5ad1fbb6af23fffb197d1b1.tar.bz2 tmwa-90ec23d0cedd0df4b5ad1fbb6af23fffb197d1b1.tar.xz tmwa-90ec23d0cedd0df4b5ad1fbb6af23fffb197d1b1.zip | |
gcc works just fine with clang
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | Makefile.in | 5 |
2 files changed, 1 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index da5eafe..5ba69f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ notifications: on_failure: always ## Use the container-based infrastructure -sudo: false +sudo: required dist: trusty python: - 2.7 @@ -75,7 +75,6 @@ matrix: - gdb - compiler: gcc env: REAL_CC=gcc-5 REAL_CXX=g++-5 LDFLAGS="-fuse-ld=gold" - sudo: true addons: apt: sources: @@ -88,7 +87,6 @@ matrix: - gdb - compiler: gcc env: REAL_CC=gcc-6 REAL_CXX=g++-6 LDFLAGS="-fuse-ld=gold" - sudo: true addons: apt: sources: @@ -101,7 +99,6 @@ matrix: - gdb - compiler: gcc env: REAL_CC=gcc-6 REAL_CXX=g++-6 REAL_EXTRA=-fsanitize=address FORCE_TESTER='' ASAN_OPTIONS=detect_leaks=0 LDFLAGS="-fuse-ld=gold" - sudo: true addons: apt: sources: diff --git a/Makefile.in b/Makefile.in index 779ca04..7710ef2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -504,11 +504,6 @@ DTEST_STAMPS := $(patsubst bin/tests/%.elf,stamp/run-%.stamp,${DTEST_BINARIES}) ${DTEST_OBJS}: override CXXFLAGS += -g -O0 -gdwarf-3 ${DTEST_STAMPS}: override TESTER=${GDB} -return-child-result -nx -batch -ex 'python file_to_load = "$<"' -x ${SRC_DIR}/tools/debug-debug.gdb --args false ${DTEST_STAMPS}: tools/debug-debug.gdb -ifeq '$(findstring clang,${CXX})' 'clang' -${DTEST_STAMPS}: - @echo "Error: sorry, but clang can't be used with gdb" - -false -endif test: test-direct test-direct: $(patsubst bin/tests/%.elf,stamp/run-%.stamp,${TEST_BINARIES}) |