Bug 1165442 - Fix LIBPATH for NSS after bug 1138824. r=glandium, a=NPOTB
authorDavid Major <dmajor@mozilla.com>
Thu, 21 May 2015 07:58:23 -0400
changeset 267539 07f9d8abe2ea53dc37fce3e09899a11f1f6b8ca2
parent 267538 457915203302559a0a04f7158551fe5a8e8b44a6
child 267540 6909732a2544966c69e9f6c3935ea78938c1a3e4
push id830
push userraliiev@mozilla.com
push dateFri, 19 Jun 2015 19:24:37 +0000
treeherdermozilla-release@932614382a68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium, NPOTB
bugs1165442, 1138824
milestone39.0
Bug 1165442 - Fix LIBPATH for NSS after bug 1138824. r=glandium, a=NPOTB
config/external/nss/Makefile.in
--- a/config/external/nss/Makefile.in
+++ b/config/external/nss/Makefile.in
@@ -369,17 +369,17 @@ include $(topsrcdir)/config/rules.mk
 
 # Can't pass this in DEFAULT_GMAKE_FLAGS because that overrides
 # definitions in NSS, so just export it into the sub-make's environment.
 ifeq (WINNT_1,$(OS_TARGET)_$(MOZ_MEMORY))
 ifdef MOZ_CRT
 # OS_LIBS comes from having mozcrt as a dependency in moz.build.
 DLLFLAGS := $(OS_LIBS)
 else
-DLLFLAGS := -LIBPATH:$(ABS_DIST)/lib -DEFAULTLIB:mozglue
+DLLFLAGS := -LIBPATH:$(ABS_DIST)/../mozglue/build -DEFAULTLIB:mozglue
 endif
 export DLLFLAGS
 endif
 
 ifdef MOZ_FOLD_LIBS
 # Force the linker to include everything from the static libraries.
 EXPAND_LIBS_EXEC += --extract