From f912e8fe10fc8de50da17283d46a3064a2c8b285 Mon Sep 17 00:00:00 2001
From: Griffin Downs <35574547+grdowns@users.noreply.github.com>
Date: Mon, 15 Apr 2019 09:10:26 -0700
Subject: [tbb] Fix config path (#6100)

* Fix config path

* Add lib prefix substitution
---
 ports/tbb/CONTROL        | 2 +-
 ports/tbb/portfile.cmake | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL
index 048f711e0..4c47458bc 100644
--- a/ports/tbb/CONTROL
+++ b/ports/tbb/CONTROL
@@ -1,3 +1,3 @@
 Source: tbb
-Version: 2019_U5
+Version: 2019_U5-1
 Description: Intel's Threading Building Blocks.
diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake
index a0895442d..b99fdb017 100644
--- a/ports/tbb/portfile.cmake
+++ b/ports/tbb/portfile.cmake
@@ -81,14 +81,14 @@ string(REPLACE
     "${_contents}"
 )
 string(REPLACE
-    "set(_tbb_release_lib \"/\${_tbb_component}.lib\")"
-    "set(_tbb_release_lib \"\${_tbb_root}/lib/\${_tbb_component}.lib\")"
+    "set(_tbb_release_lib \"/${TBB_LIB_PREFIX}\${_tbb_component}.${TBB_LIB_EXT}\")"
+    "set(_tbb_release_lib \"\${_tbb_root}/lib/${TBB_LIB_PREFIX}\${_tbb_component}.${TBB_LIB_EXT}\")"
     _contents
     "${_contents}"
 )
 string(REPLACE
-    "set(_tbb_debug_lib \"/\${_tbb_component}_debug.lib\")"
-    "set(_tbb_debug_lib \"\${_tbb_root}/debug/lib/\${_tbb_component}_debug.lib\")"
+    "set(_tbb_debug_lib \"/${TBB_LIB_PREFIX}\${_tbb_component}_debug.${TBB_LIB_EXT}\")"
+    "set(_tbb_debug_lib \"\${_tbb_root}/debug/lib/${TBB_LIB_PREFIX}\${_tbb_component}_debug.${TBB_LIB_EXT}\")"
     _contents
     "${_contents}"
 )
-- 
cgit v1.2.3