diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-06-12 09:15:11 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-06-12 09:15:11 +0200 |
commit | de12094b0e97e36485a26abce86a014d4bddd0de (patch) | |
tree | dd9db99a798674258d2f46a6068b910505fa6069 /pkgs/development/interpreters/hiphopvm/tbb.patch | |
parent | e4dc3f8ae3665f005b241edee76bfbcde7c1b1c1 (diff) | |
parent | af3d448d335cd22355b6b84857520cfa5cfb380e (diff) | |
download | nixlib-de12094b0e97e36485a26abce86a014d4bddd0de.tar nixlib-de12094b0e97e36485a26abce86a014d4bddd0de.tar.gz nixlib-de12094b0e97e36485a26abce86a014d4bddd0de.tar.bz2 nixlib-de12094b0e97e36485a26abce86a014d4bddd0de.tar.lz nixlib-de12094b0e97e36485a26abce86a014d4bddd0de.tar.xz nixlib-de12094b0e97e36485a26abce86a014d4bddd0de.tar.zst nixlib-de12094b0e97e36485a26abce86a014d4bddd0de.zip |
Merge recent master
Diffstat (limited to 'pkgs/development/interpreters/hiphopvm/tbb.patch')
-rw-r--r-- | pkgs/development/interpreters/hiphopvm/tbb.patch | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/pkgs/development/interpreters/hiphopvm/tbb.patch b/pkgs/development/interpreters/hiphopvm/tbb.patch deleted file mode 100644 index 0dee06d00fd7..000000000000 --- a/pkgs/development/interpreters/hiphopvm/tbb.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMake/FindTBB.cmake b/CMake/FindTBB.cmake -index 6a09c85..977418c 100644 ---- a/CMake/FindTBB.cmake -+++ b/CMake/FindTBB.cmake -@@ -164,7 +164,7 @@ mark_as_advanced(TBB_INCLUDE_DIR) - #-- Look for libraries - # GvdB: $ENV{TBB_ARCH_PLATFORM} is set by the build script tbbvars[.bat|.sh|.csh] - if (NOT $ENV{TBB_ARCH_PLATFORM} STREQUAL "") -- set (TBB_LIBRARY_DIR "${_TBB_INSTALL_DIR}/$ENV{TBB_ARCH_PLATFORM}/lib") -+ set (TBB_LIBRARY_DIR "${_TBB_INSTALL_DIR}/lib/$ENV{TBB_ARCH_PLATFORM}") - else (NOT $ENV{TBB_ARCH_PLATFORM} STREQUAL "") - # HH: deprecated - message(STATUS "[Warning] FindTBB.cmake: The use of TBB_ARCHITECTURE and TBB_COMPILER is deprecated and may not be supported in future versions. Please set $ENV{TBB_ARCH_PLATFORM} (using tbbvars.[bat|csh|sh]).") |