diff options
| author | Robert Scott <code@humanleg.org.uk> | 2016-03-26 17:38:50 +0000 |
|---|---|---|
| committer | Robert Scott <code@humanleg.org.uk> | 2016-03-26 17:38:50 +0000 |
| commit | 7a3e154c27b5df288ddd3f428adc1e1030fcf88c (patch) | |
| tree | 3ffccf65154674c007371b8aafaaa79e4966d1fc /pkgs/servers/osrm-backend | |
| parent | ce2c13675d2bba293278373ca793a8c6eca4e197 (diff) | |
| download | nixpkgs-7a3e154c27b5df288ddd3f428adc1e1030fcf88c.tar nixpkgs-7a3e154c27b5df288ddd3f428adc1e1030fcf88c.tar.gz nixpkgs-7a3e154c27b5df288ddd3f428adc1e1030fcf88c.tar.bz2 nixpkgs-7a3e154c27b5df288ddd3f428adc1e1030fcf88c.tar.lz nixpkgs-7a3e154c27b5df288ddd3f428adc1e1030fcf88c.tar.xz nixpkgs-7a3e154c27b5df288ddd3f428adc1e1030fcf88c.tar.zst nixpkgs-7a3e154c27b5df288ddd3f428adc1e1030fcf88c.zip | |
osrm-backend: add patch fixing build by un-hard-coding gcc-ar and gcc-ranlib paths
Diffstat (limited to 'pkgs/servers/osrm-backend')
| -rw-r--r-- | pkgs/servers/osrm-backend/4.5.0-gcc-binutils.patch | 15 | ||||
| -rw-r--r-- | pkgs/servers/osrm-backend/default.nix | 1 |
2 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/servers/osrm-backend/4.5.0-gcc-binutils.patch b/pkgs/servers/osrm-backend/4.5.0-gcc-binutils.patch new file mode 100644 index 00000000000..87b9b9501c4 --- /dev/null +++ b/pkgs/servers/osrm-backend/4.5.0-gcc-binutils.patch @@ -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() diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index 3e9e2158524..43db076b2a9 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -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; }) |