File tree 2 files changed +22
-7
lines changed
2 files changed +22
-7
lines changed Original file line number Diff line number Diff line change @@ -35,7 +35,7 @@ matrix:
35
35
# are overriden by Travis. Setting the compiler in Travis doesn't work
36
36
# either because it strips version.
37
37
38
- - env : COMPILER= clang-4.0
38
+ - env : MATRIX_EVAL="CC= clang-4.0 && CXX=clang++-4.0"
39
39
addons :
40
40
apt :
41
41
sources :
@@ -46,7 +46,7 @@ matrix:
46
46
- clang-4.0
47
47
- libstdc++-4.9-dev
48
48
49
- - env : COMPILER= gcc-5
49
+ - env : MATRIX_EVAL="CC= gcc-5 && CXX=g++-5"
50
50
addons :
51
51
apt :
52
52
sources :
@@ -56,7 +56,7 @@ matrix:
56
56
- g++-5
57
57
- libjemalloc-dev
58
58
59
- - env : COMPILER= gcc-6
59
+ - env : MATRIX_EVAL="CC= gcc-6 && CXX=g++-6"
60
60
addons :
61
61
apt :
62
62
sources :
@@ -85,12 +85,16 @@ before_script:
85
85
# Install lcov to coveralls conversion + upload tool.
86
86
- gem install coveralls-lcov
87
87
- lcov --version
88
+ # Set CC and CXX based on the matrix environment
89
+ - eval "${MATRIX_EVAL}"
90
+ # Build folly
91
+ - mkdir build
92
+ - ./scripts/build_folly.sh build/folly-src build/folly-install
88
93
89
94
script :
90
- - mkdir build
91
95
- cd build
92
- - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DRSOCKET_CC=$COMPILER
93
- -DRSOCKET_ASAN=$ASAN -DRSOCKET_INSTALL_DEPS=True
96
+ - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DRSOCKET_ASAN=$ASAN
97
+ -DCMAKE_PREFIX_PATH=$PWD/folly-install
94
98
-DRSOCKET_BUILD_WITH_COVERAGE=ON ..
95
99
- make -j4
96
100
- lcov --directory . --zerocounters
Original file line number Diff line number Diff line change @@ -9,6 +9,13 @@ if [[ -z $INSTALL_DIR ]]; then
9
9
exit 1
10
10
fi
11
11
12
+ # Convert INSTALL_DIR to an absolute path so it still refers to the same
13
+ # location after we cd into the build directory.
14
+ case " $INSTALL_DIR " in
15
+ /* ) ;;
16
+ * ) INSTALL_DIR=" $PWD /$INSTALL_DIR "
17
+ esac
18
+
12
19
# If folly was already installed, just return early
13
20
INSTALL_MARKER_FILE=" $INSTALL_DIR /folly.installed"
14
21
if [[ -f $INSTALL_MARKER_FILE ]]; then
28
35
29
36
mkdir -p " $CHECKOUT_DIR /_build"
30
37
cd " $CHECKOUT_DIR /_build"
31
- cmake " -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} " ..
38
+ if ! cmake " -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} " ..; then
39
+ echo " error configuring folly" >&2
40
+ tail -n 100 CMakeFiles/CMakeError.log >&2
41
+ exit 1
42
+ fi
32
43
make -j4
33
44
make install
34
45
touch " $INSTALL_MARKER_FILE "
You can’t perform that action at this time.
0 commit comments