Bug 1371991 - don't link against crmf when building with --with-system-nss, r=ted
authorFranziskus Kiefer <franziskuskiefer@gmail.com>
Wed, 04 Apr 2018 14:36:12 +0200
changeset 465223 f242fa9cd57f62cf097ce6c9401994eba62c025f
parent 465222 1e1073bb1a7a546c001460c79d23168e1b21bdc8
child 465224 8a463b11e2411cf11ce3113c00a3ef63f844f2d8
push id9165
push userasasaki@mozilla.com
push dateThu, 26 Apr 2018 21:04:54 +0000
treeherdermozilla-beta@064c3804de2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1371991
milestone61.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 1371991 - don't link against crmf when building with --with-system-nss, r=ted Differential Revision: https://phabricator.services.mozilla.com/D836
old-configure.in
--- a/old-configure.in
+++ b/old-configure.in
@@ -1764,19 +1764,17 @@ dnl ====================================
 MOZ_ARG_WITH_BOOL(system-nss,
 [  --with-system-nss       Use system installed NSS],
     _USE_SYSTEM_NSS=1 )
 
 if test -n "$_USE_SYSTEM_NSS"; then
     AM_PATH_NSS(3.36, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
 fi
 
-if test -n "$MOZ_SYSTEM_NSS"; then
-   NSS_LIBS="$NSS_LIBS -lcrmf"
-else
+if test -z "$MOZ_SYSTEM_NSS"; then
    NSS_CFLAGS="-I${DIST}/include/nss"
    case "${OS_ARCH}" in
         # Only few platforms have been tested with GYP
         WINNT|Darwin|Linux|DragonFly|FreeBSD|NetBSD|OpenBSD|SunOS)
             ;;
         *)
             AC_MSG_ERROR([building in-tree NSS is not supported on this platform. Use --with-system-nss])
             ;;