Bug 600433: Build shlibsign for i386 in a Mac UB. r=ted a=b
authorKyle Huey <khuey@kylehuey.com>
Sun, 21 Nov 2010 13:45:21 -0500
changeset 57970 885574b5c18c0d50a8903cfd880aed4b1afeb39a
parent 57969 be4b69a4babfb0a62fe0d6de850dc8df9a5ba020
child 57971 c8a4b4ed9160aa0693360d6ab68e79f130db3ae0
push id1
push usershaver@mozilla.com
push dateTue, 04 Jan 2011 17:58:04 +0000
reviewersted, b
bugs600433
milestone2.0b8pre
Bug 600433: Build shlibsign for i386 in a Mac UB. r=ted a=b
security/manager/Makefile.in
--- a/security/manager/Makefile.in
+++ b/security/manager/Makefile.in
@@ -289,18 +289,20 @@ DEFAULT_GMAKE_FLAGS += \
 	OS_RELEASE="2.6" \
 	OS_LIBS= \
 	STANDARDS_CFLAGS="-std=gnu89" \
 	DSO_CFLAGS="$(CFLAGS) -DCHECK_FORK_GETPID -DRTLD_NOLOAD=0 -DANDROID_VERSION=$(ANDROID_VERSION) -include $(ABS_topsrcdir)/security/manager/android_stub.h" \
 	DSO_LDOPTS="-shared $(LDFLAGS) $(WRAP_MALLOC_CFLAGS) $(WRAP_MALLOC_LIB) " \
 	$(NULL)
 endif
 
+ifndef UNIVERSAL_BINARY
 SKIP_CHK=1
 endif
+endif
 ifdef WRAP_MALLOC_CFLAGS
 DEFAULT_GMAKE_FLAGS += \
 	LDFLAGS="$(LDFLAGS) $(WRAP_MALLOC_CFLAGS) $(WRAP_MALLOC_LIB) " \
 	$(NULL)
 endif
 
 SUBMAKEFILES = boot/Makefile ssl/Makefile pki/Makefile locales/Makefile