Merge pull request #963

44dab04 Build: use libstdc++ with clang < 3.7 (anonimal) 455ded4 Build: use Boost 1.58 for Travis build. Refs #956 (anonimal)
monero-project · Aug 16, 2016 · 63ba244 · 63ba244
2 parents 40e8c6c + 44dab04
commit 63ba244
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,7 +14,6 @@ addons:
     - gcc
     - clang
     - graphviz
-    - libboost1.55-all-dev
     - libdb++-dev
     - libdb-dev
     - libgtest-dev
@@ -23,8 +22,13 @@ addons:
     - libssl1.0.0
     - libunbound-dev
     - libunwind8-dev
-    #sources:
-    #- ubuntu-toolchain-r-test
+    sources:
+    - ubuntu-toolchain-r-test
+before_install:
+- sudo add-apt-repository -y ppa:kojoley/boost
+- sudo apt-get -q update
+install:
+- sudo apt-get -y install libboost-{chrono,program-options,date-time,thread,system,filesystem,regex,serialization}1.58{-dev,.0}
 script: make -j2 && HAVE_DOT=YES doxygen Doxyfile
 notifications:
   email: false

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -407,8 +407,8 @@ else()
     set(USE_LTO false)
     # explicitly define stdlib for older versions of clang
     if(CMAKE_C_COMPILER_VERSION VERSION_LESS 3.7)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
-      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++")
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libstdc++")
+      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libstdc++")
     endif()
   endif()