Skip to content

Commit

Permalink
gcc works just fine with clang
Browse files Browse the repository at this point in the history
  • Loading branch information
Helianthella committed Mar 6, 2018
1 parent dba5f50 commit 90ec23d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
5 changes: 1 addition & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ notifications:
on_failure: always

## Use the container-based infrastructure
sudo: false
sudo: required
dist: trusty
python:
- 2.7
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
5 changes: 0 additions & 5 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down

0 comments on commit 90ec23d

Please sign in to comment.