@@ -221,7 +221,7 @@ function _get_llvm_target_triple(self)
221
221
end
222
222
223
223
-- make the rpathdir flag
224
- function rpathdir (self , dir )
224
+ function _rpathdir (self , dir )
225
225
dir = path .translate (dir )
226
226
if self :has_flags (" -Wl,-rpath=" .. dir , " ldflags" ) then
227
227
local flags = {" -Wl,-rpath=" .. (dir :gsub (" @[%w_]+" , function (name )
@@ -309,13 +309,13 @@ function nf_runtime(self, runtime, opt)
309
309
maps [" c++_shared" ] = table .join (maps [" c++_shared" ], " -L" .. triple_libdir )
310
310
end
311
311
-- add rpath to avoid the user need to set LD_LIBRARY_PATH by hand
312
- maps [" c++_shared" ] = table .join (maps [" c++_shared" ], rpathdir (self , libdir ))
312
+ maps [" c++_shared" ] = table .join (maps [" c++_shared" ], _rpathdir (self , libdir ))
313
313
if triple_libdir then
314
- maps [" c++_shared" ] = table .join (maps [" c++_shared" ], rpathdir (self , triple_libdir ))
314
+ maps [" c++_shared" ] = table .join (maps [" c++_shared" ], _rpathdir (self , triple_libdir ))
315
315
end
316
316
if target :kind () == " shared" and self :is_plat (" macosx" , " iphoneos" , " watchos" ) then
317
- table .join2 (maps [" c++_shared" ], " -install_name" )
318
- table .join2 (maps [" c++_shared" ], " @rpath/" .. path .filename (target :filename ()))
317
+ maps [ " c++_shared " ] = table .join (maps [" c++_shared" ], " -install_name" )
318
+ maps [ " c++_shared " ] = table .join (maps [" c++_shared" ], " @rpath/" .. path .filename (target :filename ()))
319
319
end
320
320
end
321
321
if runtime :endswith (" _static" ) and _has_static_libstdcxx (self ) then
0 commit comments