Backout 28807b41f92e (bug 818903) for errors during configure
authorEd Morley <emorley@mozilla.com>
Mon, 10 Dec 2012 18:23:45 +0000
changeset 115540 a6414d3438759f39cd50ae80c4210813805b8782
parent 115539 0e23cc4a25b7af6975ceff03e948528250ecd1fc
child 115541 827c31623942bd6032334bc87bba141418c851cc
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
bugs818903
milestone20.0a1
backs out28807b41f92e3b1693eced79193d1dc77c918a2f
Backout 28807b41f92e (bug 818903) for errors during configure
configure.in
security/build/Makefile.in
--- a/configure.in
+++ b/configure.in
@@ -1424,18 +1424,17 @@ if test "$GNU_CC"; then
     _SAVE_LDFLAGS=$LDFLAGS
     LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
     AC_TRY_LINK(,,AC_MSG_RESULT([yes]),
                   AC_MSG_RESULT([no])
                   LDFLAGS=$_SAVE_LDFLAGS)
     AC_MSG_CHECKING([for --build-id option to ld])
     _SAVE_LDFLAGS=$LDFLAGS
     LDFLAGS="$LDFLAGS -Wl,--build-id"
-    AC_TRY_LINK(,,AC_MSG_RESULT([yes])
-                  NSPR_LDFLAGS="$NSPR_LDFLAGS -Wl,--build-id",
+    AC_TRY_LINK(,,AC_MSG_RESULT([yes]),
                   AC_MSG_RESULT([no])
                   LDFLAGS=$_SAVE_LDFLAGS)
 
 
     # Check for -mssse3 on $CC
     AC_MSG_CHECKING([if toolchain supports -mssse3 option])
     HAVE_TOOLCHAIN_SUPPORT_MSSSE3=
     _SAVE_CFLAGS=$CFLAGS
@@ -3759,17 +3758,17 @@ if test -n "$MOZ_LINKER" -a -z "$MOZ_OLD
   if test "$ac_cv_crt_has_text_relocations" = yes; then
     dnl While we want libraries to skip the CRT files, we don't want
     dnl executables to be treated the same way. We thus set the flag
     dnl in DSO_LDOPTS and not LDFLAGS. However, to pass it to nspr,
     dnl we need to use LDFLAGS because nspr doesn't inherit DSO_LDOPTS.
     dnl Using LDFLAGS in nspr is safe, since we only really build
     dnl libraries there.
     DSO_LDOPTS="$DSO_LDOPTS -nostartfiles"
-    NSPR_LDFLAGS="$NSPR_LDFLAGS -nostartfiles"
+    NSPR_LDFLAGS=-nostartfiles
   fi
 fi
 
 dnl Check for the existence of various allocation headers/functions
 
 MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h"
 MALLOC_H=
 
--- a/security/build/Makefile.in
+++ b/security/build/Makefile.in
@@ -280,24 +280,20 @@ NSS_DIRS += \
 ifdef ENABLE_TESTS
 NSS_DIRS += \
   nss/cmd/certutil \
   nss/cmd/pk12util \
   nss/cmd/modutil \
   $(NULL)
 endif
 
-ifneq(,$(filter -Wl,--build-id,$(LDFLAGS)))
-DEFAULT_GMAKE_ENV = LDFLAGS=-Wl,--build-id
-endif
-
 ifndef MOZ_NATIVE_NSS
 define build_rules
 libs::
-	$$(DEFAULT_GMAKE_ENV) $$(MAKE) -C $$(NSS_SRCDIR)/security/$(1) $$(DEFAULT_GMAKE_FLAGS)
+	$$(MAKE) -C $$(NSS_SRCDIR)/security/$(1) $$(DEFAULT_GMAKE_FLAGS)
 
 clean clobber clobber_all realclean distclean depend::
 	$$(MAKE) -C $$(NSS_SRCDIR)/security/$(1) $$(DEFAULT_GMAKE_FLAGS) clean
 endef
 $(foreach dir,$(NSS_DIRS),$(eval $(call build_rules,$(dir))))
 
 NSS_LIBS = \
   $(LOADABLE_ROOT_MODULE) \