Bug 1166515 - Ensure that the two slices in the libnssckbi.dylib fat
authorSteven Michaud <smichaud@pobox.com>
Wed, 20 May 2015 16:28:19 -0700
changeset 11461 17b065430727befe3251d63583b350d7dc120564
parent 11460 fbc1ef3ad490080ad24b91b1cf92de863d670cdc
child 11462 ae72d76f8d2472505b499c498191c3ce441b6a17
push id641
push userwtc@google.com
push dateWed, 20 May 2015 23:28:31 +0000
bugs1166515
Bug 1166515 - Ensure that the two slices in the libnssckbi.dylib fat binary have the same type (Mach-O bundle). r=wtc.
lib/ckfw/builtins/config.mk
lib/ckfw/capi/config.mk
--- a/lib/ckfw/builtins/config.mk
+++ b/lib/ckfw/builtins/config.mk
@@ -25,13 +25,10 @@ endif
 
 # Needed for compilation of $(OBJDIR)/certdata.c
 INCLUDES += -I.
 
 #
 # To create a loadable module on Darwin, we must use -bundle.
 #
 ifeq ($(OS_TARGET),Darwin)
-ifndef USE_64
 DSO_LDOPTS = -bundle
 endif
-endif
-
--- a/lib/ckfw/capi/config.mk
+++ b/lib/ckfw/capi/config.mk
@@ -22,13 +22,10 @@ endif
 ifdef BUILD_IDG
     DEFINES += -DNSSDEBUG
 endif
 
 #
 # To create a loadable module on Darwin, we must use -bundle.
 #
 ifeq ($(OS_TARGET),Darwin)
-ifndef USE_64
 DSO_LDOPTS = -bundle
 endif
-endif
-