summaryrefslogtreecommitdiff
path: root/moz
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-11-04 11:34:28 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-11-04 11:34:28 +0000
commit1097edc1e2275e8453829b1959c53ffe9d1343f9 (patch)
tree538e19a8e77cd3d4a9a090d817ea8c10307f036a /moz
parent65270c4e9318036100401ec1fb09443c1bdb239a (diff)
We always either build nss or use the system one
We always either build nss or use the system one, so there isn't a case where we want to bundle the ancient nss in the pre-builds
Diffstat (limited to 'moz')
-rw-r--r--moz/zipped/makefile.mk4
1 files changed, 1 insertions, 3 deletions
diff --git a/moz/zipped/makefile.mk b/moz/zipped/makefile.mk
index 36469cbd2887..0f1fe2c503bd 100644
--- a/moz/zipped/makefile.mk
+++ b/moz/zipped/makefile.mk
@@ -97,7 +97,7 @@ LIBLIST =
BIN_RUNTIMELIST =
NSS_INCLUDE_LIST =
NSS_MODULE_RUNTIME_LIST =
-.IF "$(ENABLE_NSS_MODULE)"=="YES"
+
# The prebuilt moz files include all the old NSS stuff from moz and not the new
# NSS libs, headers, etc, from the separate nss module. If we use the nss module
# then we must take care not to deliver the old NSS stuff from the "prebuilts"
@@ -187,8 +187,6 @@ NSS_MODULE_RUNTIME_LIST:= \
sqlite/sqlite3 \
ssl3
-
-.ENDIF #.IF "$(ENABLE_NSS_MODULE)"=="YES"
# Remove the nss libs build in moz and those build in the nss module
$(MISC)$/replace_old_nss_libs : $(MISC)$/unpacked_$(TARGET)_lib \
$(MISC)$/unpacked_$(TARGET)_inc $(BIN)$/mozruntime.zip