summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Michaud <smichaud@pobox.com>2015-05-20 16:28:19 -0700
committerSteven Michaud <smichaud@pobox.com>2015-05-20 16:28:19 -0700
commit7735455e02ac2941c826ead503cbd6dac39fe8a5 (patch)
treebbc8a50c74400492fc0357d3e9c8aab1e1b94e93
parent563a4e16d963ecde0eb0f2ff11e7407a9d8c0137 (diff)
downloadnss-hg-7735455e02ac2941c826ead503cbd6dac39fe8a5.tar.gz
Bug 1166515 - Ensure that the two slices in the libnssckbi.dylib fat
binary have the same type (Mach-O bundle). r=wtc.
-rw-r--r--lib/ckfw/builtins/config.mk3
-rw-r--r--lib/ckfw/capi/config.mk3
2 files changed, 0 insertions, 6 deletions
diff --git a/lib/ckfw/builtins/config.mk b/lib/ckfw/builtins/config.mk
index 31b0f9b1a..b385ac6fe 100644
--- a/lib/ckfw/builtins/config.mk
+++ b/lib/ckfw/builtins/config.mk
@@ -30,8 +30,5 @@ 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
-
diff --git a/lib/ckfw/capi/config.mk b/lib/ckfw/capi/config.mk
index 5f064fb9b..ec0a86271 100644
--- a/lib/ckfw/capi/config.mk
+++ b/lib/ckfw/capi/config.mk
@@ -27,8 +27,5 @@ endif
# To create a loadable module on Darwin, we must use -bundle.
#
ifeq ($(OS_TARGET),Darwin)
-ifndef USE_64
DSO_LDOPTS = -bundle
endif
-endif
-