Skip to content

Commit f1d09c3

Browse files
change override -std=c++14 to append
1 parent 666e821 commit f1d09c3

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Build tests with coverage
2525
run: |
2626
make clean
27-
make test COVERAGE=1 CXX=g++ CXXFLAGS="-std=c++14 -O0 -g --coverage" LDFLAGS="--coverage"
27+
make test COVERAGE=1 CXX=g++ CXXFLAGS="-O0 -g --coverage" LDFLAGS="--coverage"
2828
2929
- name: Run tests
3030
run: ./bin/test_main

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ INTEL = $(shell type icpc >/dev/null 2>&1; echo $$?)
141141
GCC = $(shell type g++ >/dev/null 2>&1; echo $$?)
142142

143143
INCS = $(shell gsl-config --cflags) -Iinclude -Iinclude/*
144-
CXXFLAGS = -std=c++14
144+
CXXFLAGS += -std=c++14
145145
LIBS = $(shell gsl-config --libs)
146146

147147
# Add pthread to library if multithreading (embarrassingly parallel) is needed

0 commit comments

Comments
 (0)