зеркало из https://github.com/mozilla/pjs.git
Bug 199134: fixed build failures on FreeBSD. We need to specify -pthread
when linking an executable (already doing that when linking a shared lib), and we need to use the -rpath-link flag to help the linker find the shared libraries that we indirectly link with. r=cls. Modified Files: coreconf/FreeBSD.mk nss/cmd/platlibs.mk
This commit is contained in:
Родитель
94c9f1e754
Коммит
7452fc6021
|
@ -57,6 +57,7 @@ DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@)
|
|||
ifndef CLASSIC_NSPR
|
||||
USE_PTHREADS = 1
|
||||
DEFINES += -D_THREAD_SAFE -D_REENTRANT
|
||||
OS_LIBS += -pthread
|
||||
DSO_LDOPTS += -pthread
|
||||
endif
|
||||
|
||||
|
|
|
@ -189,6 +189,10 @@ ifeq ($(OS_ARCH), BSD_OS)
|
|||
EXTRA_SHARED_LIBS += -Wl,-rpath-link,$(DIST)/lib
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH), FreeBSD)
|
||||
EXTRA_SHARED_LIBS += -Wl,-rpath-link,$(DIST)/lib
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH), Darwin)
|
||||
EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
|
||||
endif
|
||||
|
|
Загрузка…
Ссылка в новой задаче