Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
4aa05bd4
Unverified
Commit
4aa05bd4
authored
Dec 06, 2017
by
Carlos O'Ryan
Committed by
Carlos O'Ryan
Dec 06, 2017
Browse files
Only switch to g++-4.9 on Linux.
parent
a868e618
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
.travis.yml
.travis.yml
+1
-1
No files found.
.travis.yml
View file @
4aa05bd4
...
...
@@ -5,7 +5,7 @@
install
:
# /usr/bin/gcc is 4.6 always, but gcc-X.Y is available.
-
if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
-
if [ "$CXX" = "g++"
] && [ "$TRAVIS_OS_NAME" = "linux"
]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
# /usr/bin/clang is 3.4, lets override with modern one.
-
if [ "$CXX" = "clang++" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then export CXX="clang++-3.7" CC="clang-3.7"; ln -sf /usr/bin/ccache /$HOME/bin/$CXX; ln -sf /usr/bin/ccache /$HOME/bin/$CC; fi
# ccache on OS X needs installation first
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment