summaryrefslogtreecommitdiff
path: root/nss
diff options
context:
space:
mode:
authorCaolán McNamara <cmc@openoffice.org>2009-11-20 12:10:32 +0000
committerCaolán McNamara <cmc@openoffice.org>2009-11-20 12:10:32 +0000
commitf7f4dd0bfcb029a66ec302f49f3358632469399e (patch)
treec2fb0d580c3ff3125255571027f20b6540ad8524 /nss
parenta297f034210313dbf8ba6e47c94e795cac9c1481 (diff)
cmcfixes67: #i105566#: better upstream-used fix to avoid the libfreebl3.so + libcrypt problem on Fedora
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 4ddd2b39015f..8c9fb41ef768 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -55,7 +55,6 @@ BUILD_OPT=1
.EXPORT: BUILD_OPT
.ENDIF
-
.IF "$(GUI)"=="UNX"
.IF "$(OS)$(COM)"=="LINUXGCC"
.IF "$(CPU)"=="X"
@@ -79,6 +78,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"