Skip to content

Commit c690555

Browse files
committed
.travis.yml is update
1 parent 6bac3ca commit c690555

File tree

2 files changed

+19
-11
lines changed

2 files changed

+19
-11
lines changed

.travis.yml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,22 @@
1-
sudo: false
2-
language: cpp
3-
compiler:
4-
- clang
1+
sudo: true
2+
language: gcc
3+
compiler: clang
4+
dist: trusty
5+
56
addons:
67
apt:
7-
sources:
8-
- llvm-toolchain-precise-5.0
98
packages:
109
- clang
10+
- libpcre2-dev
11+
12+
before_install:
13+
- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
14+
- sudo apt-get update -qq
15+
1116
install:
12-
- "[ $CXX = clang++ ] && export CXX=clang++ || true"
17+
- sudo apt-get install -qq g++-8
18+
- sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 90
19+
- g++ --version
20+
- export CXX=g++
1321
script:
14-
- make
22+
- make

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ DESATOMAT := /www/root/desatomat/console/desatomat.php
88

99
CXXFLAGS := -std=c++2a -Iinclude -O3 -Wno-gnu-string-literal-operator-template
1010
#-Xclang -fconcepts-ts
11-
LDFLAGS := -L/usr/local/Cellar/pcre2/10.31/lib -lpcre2-8
11+
LDFLAGS := -lpcre2-8
1212

1313

1414
TESTS := $(wildcard tests/*.cpp) $(wildcard tests/benchmark/*.cpp)
@@ -24,7 +24,7 @@ $(TRUE_TARGETS): %: %.o
2424
$(CXX) $< $(LDFLAGS) -o $@
2525

2626
$(OBJECTS): %.o: %.cpp
27-
time $(CXX) $(CXXFLAGS) -MMD -c $< -o $@
27+
$(CXX) $(CXXFLAGS) -MMD -c $< -o $@
2828

2929
-include $(DEPEDENCY_FILES)
3030

@@ -50,4 +50,4 @@ include/ctre/pcre.hpp: include/ctre/pcre.gram
5050

5151
#include/ctre/simple.hpp: include/ctre/simple.gram
5252
# @echo "LL1q $<"
53-
# @$(DESATOMAT) --ll --q --input=include/ctre/simple.gram --output=include/ctre/ --generator=cpp_ctll_v2 --cfg:fname=simple.hpp --cfg:namespace=ctre --cfg:guard=CTRE__SIMPLE__HPP --cfg:grammar_name=simple
53+
# @$(DESATOMAT) --ll --q --input=include/ctre/simple.gram --output=include/ctre/ --generator=cpp_ctll_v2 --cfg:fname=simple.hpp --cfg:namespace=ctre --cfg:guard=CTRE__SIMPLE__HPP --cfg:grammar_name=simple

0 commit comments

Comments
 (0)