mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-02 21:10:08 +00:00
osrm-backend: add patch fixing build by un-hard-coding gcc-ar and gcc-ranlib paths
(cherry picked from commit 7a3e154c27)
Signed-off-by: Domen Kožar <domen@dev.si>
This commit is contained in:
committed by
Domen Kožar
parent
939612898d
commit
076dd96812
15
pkgs/servers/osrm-backend/4.5.0-gcc-binutils.patch
Normal file
15
pkgs/servers/osrm-backend/4.5.0-gcc-binutils.patch
Normal 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()
|
||||
@@ -12,6 +12,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;
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user