summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorPeter Foley <pefoley2@verizon.net>2013-01-02 18:10:13 -0500
committerTor Lillqvist <tml@iki.fi>2013-01-07 09:22:15 +0000
commit6eff6fae6272e8ed5d74553597bb4b73db3f2864 (patch)
treefc6023495e56a2a512e28f421f9ba1f5d82e26fd /Makefile.in
parent85e36d2baa54eb7b65cc680389eacb2b5884c100 (diff)
Get rid of nsinstall hackery
This removes the need for using NSS Build Tools on windows. It also removes the nees to build nss for the build system while cross compiling. Change-Id: I13c9fdb575223f2940d3e4eda00e77ba9158f2b7 Reviewed-on: https://gerrit.libreoffice.org/1534 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in7
1 files changed, 0 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in
index fb00c389b9b2..f0b5ce148b35 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -301,13 +301,6 @@ cross-toolset: bootstrap fetch
$(GNUMAKE) gb_Side=build icu
#
cd cross_toolset && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
-#
-ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
-ifneq (WNT,$(OS))
-# We need to build nss for nsinstall... See NSINSTALL=... in nss/makefile.mk
- $(GNUMAKE) gb_Side=build nss
-endif
-endif
#
# Install