Bug 1652330 - NSPR 4.27 dev snapshot 2 to pick up a fix for macOS 11.…

… r=kjacobs UPGRADE_NSPR_RELEASE Differential Revision: https://phabricator.services.mozilla.com/D83762
dothq · Jul 16, 2020 · 2aa521f · 2aa521f
1 parent 5607802
commit 2aa521f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/nsprpub/TAG-INFO b/nsprpub/TAG-INFO
@@ -1 +1 @@
-918ebd6f0a3b33666a1359e26ba5c671d1b89ab5
+608f1e672c2e771357d6937716fe25e5be231e46
diff --git a/nsprpub/config/prdepend.h b/nsprpub/config/prdepend.h
@@ -10,3 +10,4 @@
  */
 
 #error "Do not include this header file."
+
diff --git a/nsprpub/pr/src/linking/prlink.c b/nsprpub/pr/src/linking/prlink.c
@@ -789,17 +789,7 @@ pr_LoadLibraryByPathname(const char *name, PRIntn flags)
         if (flags & PR_LD_LOCAL) {
             dl_flags |= RTLD_LOCAL;
         }
-#if defined(DARWIN)
-        /* ensure the file exists if it contains a slash character i.e. path */
-        /* DARWIN's dlopen ignores the provided path and checks for the */
-        /* plain filename in DYLD_LIBRARY_PATH */
-        if (strchr(name, PR_DIRECTORY_SEPARATOR) == NULL ||
-            PR_Access(name, PR_ACCESS_EXISTS) == PR_SUCCESS) {
-            h = dlopen(name, dl_flags);
-        }
-#else
         h = dlopen(name, dl_flags);
-#endif
 #elif defined(USE_HPSHL)
         int shl_flags = 0;
         shl_t h;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		918ebd6f0a3b33666a1359e26ba5c671d1b89ab5
		608f1e672c2e771357d6937716fe25e5be231e46
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,3 +10,4 @@
		*/

		#error "Do not include this header file."