@@ -389,19 +389,20 @@ function check_dynamic_linkage(oh, prefix, bin_files, sandbox_lock::ReentrantLoc
389
389
autofix:: Bool = true ,
390
390
src_name:: AbstractString = " " ,
391
391
)
392
- all_ok = true
392
+ all_ok = Threads . Atomic {Bool} ( true )
393
393
# If it's a dynamic binary, check its linkage
394
394
if isdynamic (oh)
395
395
rp = RPath (oh)
396
396
397
+ filename = relpath (path (oh), prefix. path)
397
398
if verbose
398
- @info (" Checking $(relpath ( path (oh), prefix . path) ) with RPath list $(rpaths (rp)) " )
399
+ @info (" Checking $(filename ) with RPath list $(rpaths (rp)) " )
399
400
end
400
401
401
402
# Look at every dynamic link, and see if we should do anything about that link...
402
403
libs = find_libraries (oh)
403
404
ignored_libraries = String[]
404
- for libname in keys (libs)
405
+ Threads . @threads for libname in keys (libs)
405
406
if should_ignore_lib (libname, oh, platform)
406
407
push! (ignored_libraries, libname)
407
408
continue
@@ -411,7 +412,7 @@ function check_dynamic_linkage(oh, prefix, bin_files, sandbox_lock::ReentrantLoc
411
412
if is_default_lib (libname, oh)
412
413
if autofix
413
414
if verbose
414
- @info (" Rpathify'ing default library $(libname) " )
415
+ @info (" $(filename) : Rpathify'ing default library $(libname) " )
415
416
end
416
417
relink_to_rpath (prefix, platform, path (oh), libs[libname], sandbox_lock; verbose, subdir= src_name)
417
418
end
@@ -430,41 +431,41 @@ function check_dynamic_linkage(oh, prefix, bin_files, sandbox_lock::ReentrantLoc
430
431
new_link = update_linkage (prefix, platform, path (oh), libs[libname], bin_files[kidx], sandbox_lock; verbose, subdir= src_name)
431
432
432
433
if verbose && new_link != = nothing
433
- @info (" Linked library $(libname) has been auto-mapped to $(new_link) " )
434
+ @info (" $(filename) : Linked library $(libname) has been auto-mapped to $(new_link) " )
434
435
end
435
436
else
436
437
if ! silent
437
- @warn (" Linked library $(libname) could not be resolved and could not be auto-mapped" )
438
+ @warn (" $(filename) : Linked library $(libname) could not be resolved and could not be auto-mapped" )
438
439
if is_troublesome_library_link (libname, platform)
439
- @warn (" Depending on $(libname) is known to cause problems at runtime, make sure to link against the JLL library instead" )
440
+ @warn (" $(filename) : Depending on $(libname) is known to cause problems at runtime, make sure to link against the JLL library instead" )
440
441
end
441
442
end
442
- all_ok = false
443
+ all_ok[] = false
443
444
end
444
445
else
445
446
if ! silent
446
- @warn (" Linked library $(libname) could not be resolved within the given prefix" )
447
+ @warn (" $(filename) : Linked library $(libname) could not be resolved within the given prefix" )
447
448
end
448
- all_ok = false
449
+ all_ok[] = false
449
450
end
450
451
elseif ! startswith (libs[libname], prefix. path)
451
452
if ! silent
452
- @warn (" Linked library $(libname) (resolved path $(libs[libname]) ) is not within the given prefix" )
453
+ @warn (" $(filename) : Linked library $(libname) (resolved path $(libs[libname]) ) is not within the given prefix" )
453
454
end
454
- all_ok = false
455
+ all_ok[] = false
455
456
end
456
457
end
457
458
458
459
if verbose && ! isempty (ignored_libraries)
459
- @info (" Ignored system libraries $(join (ignored_libraries, " , " )) " )
460
+ @info (" $(filename) : Ignored system libraries $(join (ignored_libraries, " , " )) " )
460
461
end
461
462
462
463
# If there is an identity mismatch (which only happens on macOS) fix it
463
464
if autofix
464
465
fix_identity_mismatch (prefix, platform, path (oh), oh, sandbox_lock; verbose, subdir= src_name)
465
466
end
466
467
end
467
- return all_ok
468
+ return all_ok[]
468
469
end
469
470
470
471
0 commit comments