From 842490583351ae7f965714913a51f32fbde2867b Mon Sep 17 00:00:00 2001 From: Apple Date: Thu, 30 Aug 2018 17:29:48 +0000 Subject: [PATCH] dyld-551.4.tar.gz --- src/dyld.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/dyld.cpp b/src/dyld.cpp index 2fd3787..808305e 100644 --- a/src/dyld.cpp +++ b/src/dyld.cpp @@ -5116,6 +5116,19 @@ static bool envVarsMatch(dyld3::launch_cache::Closure mainClosure, const char* e } } + // FIXME: dyld3 doesn't support versioned paths so we need to fall back to dyld2 if we have them. + // dyld3: support DYLD_VERSIONED_*_PATHs ? + if ( sEnv.DYLD_VERSIONED_LIBRARY_PATH != nullptr ) { + if ( gLinkContext.verboseWarnings ) + dyld::log("dyld: closure %p not used because DYLD_VERSIONED_LIBRARY_PATH used\n", mainClosure.binaryData()); + return false; + } + if ( sEnv.DYLD_VERSIONED_FRAMEWORK_PATH != nullptr ) { + if ( gLinkContext.verboseWarnings ) + dyld::log("dyld: closure %p not used because DYLD_VERSIONED_FRAMEWORK_PATH used\n", mainClosure.binaryData()); + return false; + } + return true; } -- 2.47.2