diff --git a/security/nss/coreconf/Darwin.mk b/security/nss/coreconf/Darwin.mk index 01b4cbd5a..6d3c4b496 100644 --- a/security/nss/coreconf/Darwin.mk +++ b/security/nss/coreconf/Darwin.mk @@ -101,6 +101,14 @@ endif ARCH = darwin +#fix missing libmozglue.dylib on TenFourFox Intel build +ifeq ($(CPU_ARCH), x86) +EXTRA_SHARED_LIBS += \ + -L$(DIST)/bin \ + $(NULL) +endif + + DSO_CFLAGS = -fPIC # May override this with different compatibility and current version numbers. DARWIN_DYLIB_VERSIONS = -compatibility_version 1 -current_version 1 diff --git a/security/nss/lib/freebl/config.mk b/security/nss/lib/freebl/config.mk index 918a66363..ffeef21f8 100644 --- a/security/nss/lib/freebl/config.mk +++ b/security/nss/lib/freebl/config.mk @@ -91,6 +91,14 @@ endif endif ifeq ($(OS_ARCH), Darwin) + +#fix missing libmozglue.dylib on TenFourFox Intel build +ifeq ($(CPU_ARCH), x86) +EXTRA_SHARED_LIBS += \ + -L$(DIST)/bin \ + $(NULL) +endif + EXTRA_SHARED_LIBS += -dylib_file @executable_path/libplc4.dylib:$(DIST)/lib/libplc4.dylib -dylib_file @executable_path/libplds4.dylib:$(DIST)/lib/libplds4.dylib endif