Skip to content

Commit

Permalink
Build: fix clang build on Travis CI. Fixes monero-project#277
Browse files Browse the repository at this point in the history
* Clang 3.6.2 is new minimum requirement
* Add clang fix for Trusty 14.04 in docs
  • Loading branch information
anonimal committed Aug 1, 2016
1 parent 7b5578d commit d0a5462
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 6 deletions.
14 changes: 8 additions & 6 deletions .travis.yml
Expand Up @@ -5,27 +5,29 @@ env:
- FORCE_INSTALL=yes
# Compiler versions
- GCC_VERSION=5
#- CLANG_VERSION=3.6
- CLANG_VERSION=3.6
# For weidai11/cryptopp#232
- CXXFLAGS="-maes -march=native"
sudo: required
dist: trusty
language: cpp
compiler:
- gcc-5
#- clang-3.6
- gcc
- clang
addons:
apt:
packages:
- gcc-5
- g++-5
#- clang-3.6
- clang-3.6
- libssl-dev
- libssl1.0.0
- libminiupnpc-dev
- doxygen
sources:
- ubuntu-toolchain-r-test
# We need 3.6.2 minimum requirement
- llvm-toolchain-precise-3.6
before_install:
- git submodule update --init --recursive
- sudo add-apt-repository -y ppa:kojoley/boost
Expand All @@ -34,8 +36,8 @@ before_install:
before_script:
- if [ "$CC" = "gcc" ]; then export CC=gcc-${GCC_VERSION}; fi
- if [ "$CXX" = "g++" ]; then export CXX=g++-${GCC_VERSION}; fi
#- if [ "$CC" = "clang" ]; then export CC=clang-${CLANG_VERSION}; fi
#- if [ "$CXX" = "clang++" ]; then export CXX=clang-${CLANG_VERSION}; fi
- if [ "$CC" = "clang" ]; then export CC=clang-${CLANG_VERSION}; fi
- if [ "$CXX" = "clang++" ]; then export CXX=clang-${CLANG_VERSION}; fi
script: make clean && make -j2 dependencies && make -j2 all-options && make -j2 tests && make doxygen && make install-resources
notifications:
email: false
Expand Down
11 changes: 11 additions & 0 deletions doc/BUILDING.md
Expand Up @@ -88,6 +88,17 @@ $ export CXXFLAGS="-maes -march=native" # weidai11/cryptopp#232

Replace ```clang``` with a clang version/path of your choosing.

### Clang for Ubuntu Trusty 14.04:

```bash
# We currently need clang 3.6.2 minimum requirement
- curl -sSL "http://llvm.org/apt/llvm-snapshot.gpg.key" | sudo -E apt-key add -
- sudo add-apt-repository -y "deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.6 main"
- sudo apt-get -q update
- sudo apt-get -y install clang-3.6

```

### Custom data path
You can customize Kovri's data path to your liking. Simply export ```KOVRI_DATA_PATH```; example:

Expand Down

0 comments on commit d0a5462

Please sign in to comment.