summaryrefslogtreecommitdiff
path: root/nss
diff options
context:
space:
mode:
authorVladimir Glazunov <vg@openoffice.org>2009-12-10 18:37:36 +0100
committerVladimir Glazunov <vg@openoffice.org>2009-12-10 18:37:36 +0100
commit304f5befadcb31f49acf764d239e38a369a87d9d (patch)
treeefe914c4b3a8c9544027dbd6b25b155d1846e0ba /nss
parentd911d3fd34a472bc504616137e219d4f24381169 (diff)
parentf7f4dd0bfcb029a66ec302f49f3358632469399e (diff)
CWS-TOOLING: integrate CWS cmcfixes67
Diffstat (limited to 'nss')
-rw-r--r--nss/makefile.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/nss/makefile.mk b/nss/makefile.mk
index cdc7aad019bf..2123c36b57a1 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -57,7 +57,6 @@ BUILD_OPT=1
.EXPORT: BUILD_OPT
.ENDIF
-
.IF "$(GUI)"=="UNX"
.IF "$(OS)$(COM)"=="LINUXGCC"
.IF "$(BUILD64)"=="1"
@@ -81,6 +80,10 @@ OUT2LIB=dist$/out$/lib$/*$(DLLPOST)
BUILD_DIR=security$/nss
BUILD_ACTION= $(GNUMAKE) nss_build_all
+#See #i105566# && moz#513024#
+.IF "$(OS)"=="LINUX"
+BUILD_ACTION+=FREEBL_NO_DEPEND=1
+.ENDIF
.ENDIF # "$(GUI)"=="UNX"