Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit9a1121d

Browse files
committed
squash: set the compiler version properly
1 parent0f42783 commit9a1121d

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

‎.travis.yml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,19 @@ env:
2828
# env: BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" CMAKE_CXX_FLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2"
2929
install:
3030
-mkdir -p ${HOME}/bin
31-
-if [ "${CC}" = "gcc" ]; then export TOOLSET="gcc"; ln -s `which g++-4.9` ${HOME}/bin/g++;
32-
ln -s `which gcc-4.9` ${HOME}/bin/gcc; fi
33-
-if [ "${CC}" = "clang" ]; then export TOOLSET="clang"; ln -s `which clang-3.6` ${HOME}/bin/clang;
34-
ln -s `which clang++-3.6` ${HOME}/bin/clang++; fi
35-
-export BOOST_VERSION=${BOOST_VER//./_}
31+
-if [ "${CC}" = "gcc" ]; then ln -s `which g++-4.9` ${HOME}/bin/g++;
32+
ln -s `which gcc-4.9` ${HOME}/bin/gcc; $HOME/bin/g++ --version;
33+
export CXX=$HOME/bin/g++;
34+
export CC=$HOME/bin/gcc;
35+
fi
36+
-if [ "${CC}" = "clang" ]; then ln -s `which clang-3.6` ${HOME}/bin/clang;
37+
ln -s `which clang++-3.6` ${HOME}/bin/clang++; $HOME/bin/clang --version;
38+
export CXX=$HOME/bin/clang++;
39+
export CC=$HOME/bin/clang++;
40+
fi
3641
-export PATH=${HOME}/bin:${PATH}
3742
-"${CXX} --version"
43+
-"${CC} --version"
3844
cache:ccache
3945
script:
4046
-pwd

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp