Skip to content

Commit

Permalink
Exports CC and CXX for gcc and clang.
Browse files Browse the repository at this point in the history
  • Loading branch information
James Chen committed Jan 9, 2014
1 parent c019501 commit 4b4dc16
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ language: cpp
env:
matrix:
- GEN_JSB=YES
- PLATFORM=linux DEBUG=1
- PLATFORM=linux DEBUG=1 CC=/usr/bin/clang CXX=/usr/bin/clang++
- PLATFORM=linux DEBUG=1 CC_COMPILER=gcc CXX_COMPILER=g++
- PLATFORM=linux DEBUG=1 CC_COMPILER=clang CXX_COMPILER=clang++
# Since switching to C++11 only the ARM version of the nactive client
# port currently builds. TODO(sbc): Re-enable all architectures.
# Disabled travis-ci build for native client port since it doesn't support std::thread, std::mutex.
Expand All @@ -24,6 +24,8 @@ env:
9lV+vgJQDRcFe7dKwtC86vk10EU7Ym2bhVmhMxi/AlmJXgavjmPVdizRT7rh
X2Ry/Nb6hGRkH3WS0T3D/KG1+e7lP/TMB9bvo6/locLJ2A6Z1YI=
script:
- export CC=$CC_COMPILER
- export CXX=$CXX_COMPILER
- tools/travis-scripts/run-script.sh
before_install:
- tools/travis-scripts/before-install.sh
Expand Down

0 comments on commit 4b4dc16

Please sign in to comment.