3
0
Fork 0
forked from mirrors/nixpkgs

osrm-backend: add patch fixing build by un-hard-coding gcc-ar and gcc-ranlib paths

This commit is contained in:
Robert Scott 2016-03-26 17:38:50 +00:00
parent ce2c13675d
commit 7a3e154c27
2 changed files with 16 additions and 0 deletions

View file

@ -0,0 +1,15 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -127,8 +127,9 @@ if(CMAKE_BUILD_TYPE MATCHES Release)
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND
NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.9.0" AND NOT MINGW)
message(STATUS "Using gcc specific binutils for LTO.")
- set(CMAKE_AR "/usr/bin/gcc-ar")
- set(CMAKE_RANLIB "/usr/bin/gcc-ranlib")
+ # Just let PATH do its job
+ set(CMAKE_AR "gcc-ar")
+ set(CMAKE_RANLIB "gcc-ranlib")
endif()
endif (HAS_LTO_FLAG)
endif()

View file

@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
patches = [
./4.5.0-openmp.patch
./4.5.0-gcc-binutils.patch
(substituteAll {
src = ./4.5.0-default-profile-path.template.patch;
})