Bug 1077214 - Don't export DLLFLAGS from main configure. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Sat, 04 Oct 2014 10:34:13 +0900
changeset 208777 5eead8ca23a3559fa627c61969d164b042484b6c
parent 208776 4da1ac5c08a17e1e897c18c9f379296d20481708
child 208778 0ca2335fa5a1c5ae7f86e193523c64fa504b411a
push id50003
push usermh@glandium.org
push dateSat, 04 Oct 2014 01:37:04 +0000
treeherdermozilla-inbound@0ca2335fa5a1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1077214
milestone35.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1077214 - Don't export DLLFLAGS from main configure. r=mshal DLLFLAGS was exported from main configure so that it would be picked by NSPR configure, allowing to pass down flags to link NSPR against mozglue. With MOZ_FOLD_LIBS always enabled on MSVC builds, that is not necessary anymore since the NSPR build system doesn't build any shared library anymore.
configure.in
--- a/configure.in
+++ b/configure.in
@@ -7168,18 +7168,16 @@ else
     if grep -q '__imp__\{0,1\}free' crtdll.obj; then
       MOZ_GLUE_LDFLAGS='-LIBPATH:$(DIST)/lib -NODEFAULTLIB:msvcrt -NODEFAULTLIB:msvcprt -DEFAULTLIB:mozcrt'
       dnl Also pass this to NSPR/NSS
       DLLFLAGS="$DLLFLAGS $MOZ_GLUE_LDFLAGS"
     else
       DLLFLAGS="$DLLFLAGS -LIBPATH:\$(DIST)/lib -DEFAULTLIB:mozglue"
     fi
     rm crtdll.obj
-
-    export DLLFLAGS
     ;;
   *)
     AC_MSG_ERROR([--enable-jemalloc not supported on ${target}])
     ;;
   esac
 fi # MOZ_MEMORY
 AC_SUBST(MOZ_MEMORY)
 AC_SUBST(MOZ_JEMALLOC3)