First fix for fdo#56902

Restrict moz to windows, and build vars also
impacts nss, connectivity

Change-Id: I27aae1398f3f8a4d046c2c7805d64bc7523c7282
Reviewed-on: https://gerrit.libreoffice.org/1233Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

config_host.mk.in

@@ -39,7 +39,6 @@ export BOOST_LDFLAGS=@BOOST_LDFLAGS@
 export BOOST_SYSTEM_LIB=@BOOST_SYSTEM_LIB@
 export BSH_JAR=@BSH_JAR@
 export BUILD_DMAKE=@BUILD_DMAKE@
-export BUILD_MOZAB=@BUILD_MOZAB@
 export BUILD_PLATFORM=@build@
 export BUILD_POSTGRESQL_SDBC=@BUILD_POSTGRESQL_SDBC@
 export BUILD_TYPE=@BUILD_TYPE@
@@ -91,7 +90,6 @@ export DBUSMENUGTK_LIBS=$(gb_SPACE)@DBUSMENUGTK_LIBS@
 export DBUS_CFLAGS=$(gb_SPACE)@DBUS_CFLAGS@
 export DBUS_LIBS=$(gb_SPACE)@DBUS_LIBS@
 export debug=@ENABLE_DEBUG@
-export DEFAULT_MOZILLA_TOOLKIT=@MOZILLA_TOOLKIT@
 export DEFAULT_TO_ENGLISH_FOR_PACKING=yes
 export DEVINSTALLDIR=@DEVINSTALLDIR@
 export DIAGRAM_EXTENSION_PACK=@DIAGRAM_EXTENSION_PACK@
@@ -170,6 +168,7 @@ export ENABLE_ZENITY=@ENABLE_ZENITY@
 export EPM=@EPM@
 export EPM_FLAGS=@EPM_FLAGS@
 export EXTERNAL_WARNINGS_NOT_ERRORS=@EXTERNAL_WARNINGS_NOT_ERRORS@
+export EXTMSV80=$(gb_Space)@EXTMSV80@
 @x_Cygwin@ export FIND=@WIN_FIND@
 export FLAT_LOGO_SVG=@FLAT_LOGO_SVG@
 export FLEX=@FLEX@
@@ -387,15 +386,11 @@ export MKDEPENDSOLVER=TRUE
 export ML_EXE=@ML_EXE@
 export MOC4=@MOC4@
 export MOC=@MOC@
-export MOZILLABUILD=@MOZILLABUILD@
 export NPAPI_HEADERS_CFLAGS=$(gb_SPACE)@NPAPI_HEADERS_CFLAGS@
-export MOZILLA_VERSION=@MOZILLA_VERSION@
-export MOZ_FLAVOUR=@MOZ_FLAVOUR@
-export MOZ_INC=@MOZ_INC@
-export MOZ_LIB=@MOZ_LIB@
-export MOZ_LIB_XPCOM=@MOZ_LIB_XPCOM@
 export MSPUB_CFLAGS=$(gb_SPACE)@MSPUB_CFLAGS@
 export MSPUB_LIBS=$(gb_SPACE)@MSPUB_LIBS@
+export MSVC80_MNFST=@MSVC80_MNFST@
+export MSVC80_DLL_DIR=@MSVC80_DLL_DIR@
 export MYSQL_DEFINES=@MYSQL_DEFINES@
 export MYSQL_INC=@MYSQL_INC@
 export MYSQL_LIB=@MYSQL_LIB@
@@ -408,6 +403,7 @@ export NM=@NM@
 export nodep=@nodep@
 export NSS_CFLAGS=$(gb_SPACE)@NSS_CFLAGS@
 export NSS_LIBS=$(gb_SPACE)@NSS_LIBS@
+export NSSBUILDTOOLS=@NSSBUILDTOOLS@
 export NUMBERTEXT_EXTENSION_PACK=@NUMBERTEXT_EXTENSION_PACK@
 @x_OBJCFLAGS@ export OBJCFLAGS=@OBJCFLAGS@
 @x_OBJCXXFLAGS@ export OBJCXXFLAGS=@OBJCXXFLAGS@
@@ -444,7 +440,6 @@ export POPPLER_CFLAGS=$(gb_SPACE)@POPPLER_CFLAGS@
 export POPPLER_LIBS=$(gb_SPACE)@POPPLER_LIBS@
 export POSTGRESQL_INC=@POSTGRESQL_INC@
 export POSTGRESQL_LIB=@POSTGRESQL_LIB@
-export PREBUILD_MOZAB=@PREBUILD_MOZAB@
 export PREFIXDIR=@PREFIXDIR@
 export PRODUCT=@PRODUCT@
 export PRODUCTNAME=@PRODUCTNAME@
@@ -548,7 +543,6 @@ export SYSTEM_LIBXSLT_FOR_BUILD=@SYSTEM_LIBXSLT_FOR_BUILD@
 export SYSTEM_LPSOLVE=@SYSTEM_LPSOLVE@
 export SYSTEM_MDDS=@SYSTEM_MDDS@
 export SYSTEM_MESA_HEADERS=@SYSTEM_MESA_HEADERS@
-export SYSTEM_MOZILLA=@SYSTEM_MOZILLA@
 export SYSTEM_NPAPI_HEADERS=@SYSTEM_NPAPI_HEADERS@
 export SYSTEM_MYSQL=@SYSTEM_MYSQL@
 export SYSTEM_MYSQL_CPPCONN=@SYSTEM_MYSQL_CPPCONN@
@@ -611,7 +605,7 @@ export WITH_KRB5=@WITH_KRB5@
 export WITH_LANG=@WITH_LANG@
 export WITH_LANG_LIST=@WITH_LANG_LIST@
 export WITH_LINKER_HASH_STYLE=@WITH_LINKER_HASH_STYLE@
-export WITH_MOZILLA=@WITH_MOZILLA@
+export WITH_MOZAB4WIN=@WITH_MOZAB4WIN@
 export WITH_MYSPELL_DICTS=@WITH_MYSPELL_DICTS@
 export WITH_POOR_HELP_LOCALIZATIONS=@WITH_POOR_HELP_LOCALIZATIONS@
 export WITH_STLPORT=@WITH_STLPORT@

connectivity/Module_connectivity.mk

@@ -118,11 +118,7 @@ endif
 
 ifeq ($(OS),WNT)
 
-ifeq ($(if $(or $(filter-out YES,$(WITH_MOZILLA)),$(filter YES,$(SYSTEM_MOZILLA))),YES),YES)
-$(eval $(call gb_Module_add_targets,connectivity,\
-	Library_mozbootstrap \
-))
-else
+ifeq ($(WITH_MOZAB4WIN),YES)
 $(eval $(call gb_Module_add_targets,connectivity,\
 	Configuration_mozab \
 	Library_mozab \

moz/README

-Used for security features, if nss is not available.
+Used only for building Windows Address book connectivity.
 
 Rebuild moz whenever changes have been made in the nss module. Those libs are
-merged into mozruntime.zip which is build in this project.
+merged into mozruntime.zip which is built in this project.
 
 Please read, please read about [[nss]].

moz/extractfiles.mk

@@ -35,23 +35,12 @@ INCLUDE_DIR=$(INCCOM)
 BIN_RUNTIMELIST= \
     xpcom \
     xpcom_core \
-    xpcom_compat	
-
-.IF "$(GUI)"=="WNT"
-BIN_RUNTIMELIST+=	\
+    xpcom_compat \
     js3250 	\
     mozz	\
     msgbsutl	\
     nsldap32v50		\
     nsldappr32v50
-.ELSE	#"$(GUI)"=="WNT"
-BIN_RUNTIMELIST+=	\
-    mozjs	\
-    mozz	\
-    msgbaseutil	\
-    ldap50	\
-    prldap50
-.ENDIF
 
 COMPONENT_RUNTIMELIST=	\
     addrbook	\
@@ -64,17 +53,9 @@ COMPONENT_RUNTIMELIST=	\
     uconv	\
     vcard	\
     i18n 	\
-    pipnss
-
-.IF "$(GUI)"=="WNT"
-COMPONENT_RUNTIMELIST+=	\
+    pipnss  \
     xppref32	\
     xpc3250
-.ELSE	#"$(GUI)"=="WNT"
-COMPONENT_RUNTIMELIST+=	\
-    pref	\
-    xpconnect
-.ENDIF
 
 COMREGISTRY_FILELIST=	\
     necko_dns.xpt	\
@@ -86,13 +67,8 @@ COMREGISTRY_FILELIST=	\
     xpcom_xpti.xpt	\
     addrbook.xpt	\
     mozldap.xpt \
-    pref.xpt
-
-.IF "$(GUI)"=="WNT"
-COMREGISTRY_FILELIST+=	xpcom_thread.xpt
-.ELSE	#"$(GUI)"=="WNT"
-COMREGISTRY_FILELIST+=	xpcom_threads.xpt
-.ENDIF
+    pref.xpt  \
+	xpcom_thread.xpt
 
 DEFAULTS_RUNTIMELIST=	\
     defaults$/pref$/browser-prefs.js	\
@@ -104,18 +80,6 @@ DEFAULTS_RUNTIMELIST=	\
     greprefs$/all.js	\
     greprefs$/security-prefs.js
 
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-
-LIBLIST=	\
-    libembed_base_s.a	\
-    libmozreg_s.a	\
-    libnslber32v50.a	\
-    libnsldap32v50.a	\
-    libxpcom_core.dll.a	\
-    libxpcom.dll.a
-
-.ELSE
 
 LIBLIST=	\
     embed_base_s.lib	\
@@ -125,30 +89,11 @@ LIBLIST=	\
     xpcom_core.lib	\
     xpcom.lib
 
-.ENDIF
-
-.ELSE   #"$(GUI)"=="WNT"
-
-LIBLIST=	\
-    libembed_base_s.a	\
-    libmozreg_s.a	\
-    liblber50.a	\
-    libxpcom_core$(DLLPOST)	\
-    libxpcom$(DLLPOST)	\
-    libmsgbaseutil$(DLLPOST)	\
-    libldap50$(DLLPOST)
-
-.ENDIF #"$(GUI)"=="WNT"
-
 INCLUDE_PATH=$(MOZ_DIST_DIR)$/include$/
 PUBLIC_PATH=$(MOZ_DIST_DIR)$/public$/
 
 
-.IF "$(GUI)"=="WNT"
 REG_SUBFIX=	.exe
-.ELSE	#"$(GUI)"=="WNT"
-REG_SUBFIX=
-.ENDIF
 
 # --- Targets ------------------------------------------------------
 
@@ -177,18 +122,6 @@ $(MISC)$/build$/so_moz_runtime_files: 	$(OUT)$/bin$/mozruntime.zip
     $(foreach,file,$(BIN_RUNTIMELIST) $(COPY) $(MOZ_BIN_DIR)$/$(DLLPRE)$(file)$(DLLPOST) \
     $(RUNTIME_DIR)$/$(DLLPRE)$(file)$(DLLPOST) &&) \
     echo >& $(NULLDEV)
-.IF "$(GUI)" == "UNX"
-    $(foreach,file,$(BIN_RUNTIMELIST) $(COPY) $(MOZ_BIN_DIR)$/$(DLLPRE)$(file)$(DLLPOST) \
-    $(LIB_DIR)$/$(DLLPRE)$(file)$(DLLPOST) &&) \
-    echo >& $(NULLDEV)
-.ENDIF # .IF "$(GUI)" == "UNX"
-
-# copy files in RES_FILELIST
-.IF "$(OS)"=="SOLARIS"
-    @$(COPY) $(MOZ_BIN_DIR)$/res$/charsetalias.properties $(RUNTIME_DIR)$/res$/charsetalias.properties
-.ELSE
-    @echo No Res Files to copy.
-.ENDIF
 
 # copy files in COMPONENT_RUNTIMELIST
     $(foreach,file,$(COMPONENT_RUNTIMELIST) $(COPY) $(MOZ_BIN_DIR)$/components$/$(DLLPRE)$(file)$(DLLPOST) \
@@ -207,34 +140,6 @@ $(MISC)$/build$/so_moz_runtime_files: 	$(OUT)$/bin$/mozruntime.zip
     $(foreach,file,$(DEFAULTS_RUNTIMELIST) $(COPY) $(MOZ_BIN_DIR)$/$(file) $(RUNTIME_DIR)$/$(file) &&) \
     echo >& $(NULLDEV)
 
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"!="MACOSX" && "$(OS)"!="AIX"
-    cd $(RUNTIME_DIR) && strip *$(DLLPOST)
-    cd $(RUNTIME_DIR)$/components && strip *$(DLLPOST)
-.ENDIF
-.ENDIF
-.IF "$(OS)"=="MACOSX"
-    $(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl shl OOO \
-        $(RUNTIME_DIR)$/*$(DLLPOST)
-# A crude hack to adapt all the absolute ("@executable_path") dependencies to
-# relative ("@loader_path") ones:
-    $(foreach,file,$(shell ls $(RUNTIME_DIR)$/components$/*$(DLLPOST)) \
-        install_name_tool \
-        -change @executable_path/libldap50.dylib \
-            @loader_path/../libldap50.dylib \
-        -change @executable_path/libmozjs.dylib @loader_path/../libmozjs.dylib \
-        -change @executable_path/libmozz.dylib @loader_path/../libmozz.dylib \
-        -change @executable_path/libmsgbaseutil.dylib \
-            @loader_path/../libmsgbaseutil.dylib \
-        -change @executable_path/libprldap50.dylib \
-            @loader_path/../libprldap50.dylib \
-        -change @executable_path/libxpcom.dylib @loader_path/../libxpcom.dylib \
-        -change @executable_path/libxpcom_compat.dylib \
-            @loader_path/../libxpcom_compat.dylib \
-        -change @executable_path/libxpcom_core.dylib \
-            @loader_path/../libxpcom_core.dylib \
-        $(file) &&) true
-.ENDIF
 
 # zip runtime files to mozruntime.zip
     cd $(RUNTIME_DIR) && zip -r ..$/..$/bin$/mozruntime.zip *
@@ -246,17 +151,8 @@ $(INCCOM)$/nsBuildID.h: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
 
 
 $(MISC)$/build$/so_moz_include_files: $(INCCOM)$/nsBuildID.h
-.IF "$(OS)"!="SOLARIS"
-    $(GNUCOPY) -pRL $(INCLUDE_PATH)* $(INCLUDE_DIR)
-    $(GNUCOPY) -pRL $(PUBLIC_PATH)* $(INCLUDE_DIR)
-.ELSE			# "$(OS)"!="SOLARIS"
     $(COPY) -pr $(INCLUDE_PATH)* $(INCLUDE_DIR)
     $(COPY) -pr $(PUBLIC_PATH)* $(INCLUDE_DIR)
-.ENDIF			# "$(OS)"!="SOLARIS"
-
-.IF "$(GUI)"=="UNX"
-    chmod -R 775 $(INCCOM)
-.ENDIF
     $(TOUCH) $@
 
 # On UNX the rules for so_moz_runtime_files copy files into the same directory
@@ -267,13 +163,6 @@ $(MISC)$/build$/so_moz_lib_files:		$(foreach,file,$(LIBLIST) $(LIB_DIR)$/$(file)
     $(foreach,file,$(LIBLIST) $(COPY) $(MOZ_DIST_DIR)$/lib$/$(file) \
     $(LIB_DIR)$/$(file) &&) \
     echo >& $(NULLDEV)
-.IF "$(OS)"=="MACOSX"
-    $(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl shl OOO \
-        $(LIB_DIR)$/*$(DLLPOST)
-.ENDIF
-.IF "$(GUI)"=="UNX"
-    chmod -R 775 $(LB)
-.ENDIF
     $(TOUCH) $@
 
 $(BIN_RUNTIMELIST): $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) 
@@ -288,23 +177,11 @@ $(COMREGISTRY_FILELIST): $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
 $(DEFAULTS_RUNTIMELIST): $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) 
     @$(COPY) $(MOZ_BIN_DIR)$/$@ $(RUNTIME_DIR)$/$@
 
-RES_FILELIST: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) 
-.IF "$(OS)"=="SOLARIS"
-    @$(COPY) $(MOZ_BIN_DIR)$/res$/charsetalias.properties $(RUNTIME_DIR)$/res$/charsetalias.properties
-.ELSE
-    @echo No Res Files to copy.
-.ENDIF
-
 $(LIB_DIR)$/%: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
     noop
 
 $(MISC)$/CREATETARBALL:	extract_mozab_files
     @@-$(MKDIR)	$(OUT)$/zipped
     $(COPY) $(BIN)$/mozruntime.zip $(OUT)$/zipped$/$(MOZTARGET)runtime.zip
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"!="MACOSX"
-    cd $(LB) && strip *$(DLLPOST)
-.ENDIF
-.ENDIF
     cd $(LB) && zip -r ..$/zipped$/$(MOZTARGET)lib.zip *
     cd $(INCCOM) && zip -r ..$/zipped$/$(MOZTARGET)inc.zip *

moz/zipped/makefile.mk

@@ -36,7 +36,7 @@ TARGET=moz_unzip
 
 # --- Files --------------------------------------------------------
 
-.IF "$(PREBUILD_MOZAB)" == "" || "$(SYSTEM_MOZILLA)" == "YES" || "$(WITH_MOZILLA)" == "NO"
+.IF "$(WITH_MOZAB4WIN)" == "NO"
 
 dummy:
     @echo "No need to unpack the prebuilt mozab packages"
@@ -44,7 +44,7 @@ dummy:
 .ELSE # unpack mozab zips
 .INCLUDE :  target.mk
 
-.IF "$(BUILD_MOZAB)"=="TRUE"
+.IF "$(BUILD_MOZAB)"=="NO"
 ALLTAR:
     @echo "Does not need build mozab zipped!"
 .ELSE
@@ -53,18 +53,7 @@ ALLTAR: \
     $(MISC)$/unpacked_$(TARGET)_lib \
     $(BIN)$/mozruntime.zip \
     $(MISC)$/remove_old_nss_libs
-.ENDIF
-.IF "$(GUI)" == "UNX"
-
-$(MISC)$/unpacked_%_lib : $(OS)$(COM)$(CPU)lib.zip '$(OS)$(COM)$(CPU)runtime.zip'
-    unzip -o -d $(LB) $(OS)$(COM)$(CPU)lib.zip && unzip -o -d $(LB) $(OS)$(COM)$(CPU)runtime.zip && $(TOUCH) $@
-    chmod -R 775 $(LB)
-
-$(MISC)$/unpacked_%_inc : $(OS)$(COM)$(CPU)inc.zip
-    unzip -o -d $(INCCOM) $(OS)$(COM)$(CPU)inc.zip && $(TOUCH)	$@
-    chmod -R 775 $(INCCOM)
-
-.ELSE
+.ENDIF # BUILD_MOZAB 
 
 $(MISC)$/unpacked_$(TARGET)_lib : $(OS)$(COM)$(CPU)lib.zip
     unzip -o -d $(LB) $(OS)$(COM)$(CPU)lib.zip && \
@@ -73,51 +62,14 @@ $(MISC)$/unpacked_$(TARGET)_lib : $(OS)$(COM)$(CPU)lib.zip
 $(MISC)$/unpacked_$(TARGET)_inc : $(OS)$(COM)$(CPU)inc.zip
     unzip -o -d $(INCCOM) $(OS)$(COM)$(CPU)inc.zip && $(TOUCH)	$@
 
-.ENDIF
+.ENDIF # WITH_MOZAB4WIN
 
 $(BIN)$/mozruntime%zip : $(OS)$(COM)$(CPU)runtime.zip
     $(COPY) $(OS)$(COM)$(CPU)runtime.zip $(BIN)$/mozruntime.zip
 
-# add alternative rules for universal binary moz-zips
-.IF "$(GUIBASE)" == "aqua"
-$(MISC)$/unpacked_%_lib : $(OS)$(COM)UBlib.zip '$(OS)$(COM)UBruntime.zip'
-    unzip -o -d $(LB) $(OS)$(COM)UBlib.zip && unzip -o -d $(LB) $(OS)$(COM)UBruntime.zip && $(TOUCH) $@
-    chmod -R 775 $(LB)
-  
-$(MISC)$/unpacked_%_inc : $(OS)$(COM)UBinc.zip
-    unzip -o -d $(INCCOM) $(OS)$(COM)UBinc.zip && $(TOUCH)	$@
-    chmod -R 775 $(INCCOM)
-
-$(BIN)$/mozruntime%zip : $(OS)$(COM)UBruntime.zip
-    $(COPY) $(OS)$(COM)UBruntime.zip $(BIN)$/mozruntime.zip
-
-.ENDIF # "$(GUIBASE)"=="aqua"
-
-LIBLIST =
 
 # The old prebuilt moz files include all the old NSS stuff from moz but we
 # always build the toplevel nss module, so we must delete all these
-NSS_RUNTIMELIST= \
-    freebl3 \
-    nspr4 \
-    plc4 \
-    plds4 \
-    nss3 \
-    ssl3 \
-    softokn3 \
-    smime3
-
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-LIBLIST= \
-    libnspr4.a \
-    libnss3.a \
-    libsmime3.a \
-    libplc4.a \
-    libplds4.a \
-    libssl3.a
-
-.ELSE
 LIBLIST= \
     nspr4.lib \
     plc4.lib \
@@ -125,19 +77,6 @@ LIBLIST= \
     nss3.lib \
     ssl3.lib\
     smime3.lib
-.ENDIF
-.ELSE   #"$(GUI)"=="WNT"
-LIBLIST= \
-    libfreebl3$(DLLPOST) \
-    libnspr4$(DLLPOST) \
-    libsoftokn3$(DLLPOST) \
-    libplc4$(DLLPOST) \
-    libplds4$(DLLPOST) \
-    libnss3$(DLLPOST) \
-    libssl3$(DLLPOST) \
-    libsmime3$(DLLPOST)
-
-.ENDIF # .IF "$(GUI)"=="WNT"
 
 NSS_RUNTIMELIST:= \
     freebl3 \
@@ -165,5 +104,3 @@ $(MISC)$/unpacked_$(TARGET)_inc $(BIN)$/mozruntime.zip
     rm -r -f $(INCCOM)$/nspr && \
         echo >& $(NULLDEV)
     $(TOUCH) $@
-
-.ENDIF   # unpack mozab zips

nss/README

@@ -6,7 +6,7 @@ nss contains the security libraries which are also part of moz. However nss is
 meant to be more current, that is it to be updated more often. This should be
 easier than doing this with moz.
 
-If nss is build depends on an environment variable (SYSTEM_NSS=NO) which
+If nss is built depends on an environment variable (SYSTEM_NSS=NO) which
 is per default set to YES. In this case nss is build before moz. The nss
 libraries/lib files/headers built in moz are then not delivered. Otherwise they
 would overwrite those from nss. That is, the nss libraries build in moz are

nss/makefile.mk

@@ -181,7 +181,7 @@ PATCH_FILES += \
 	       nss.patch.mingw \
 
 
-PATH!:=$(MOZILLABUILD)/bin:$(PATH)
+PATH!:=$(NSSBUILDTOOLS)/bin:$(PATH)
 
 nss_CC=$(CC)
 nss_CXX=$(CXX)
@@ -217,7 +217,7 @@ OUT2LIB= \
 .ELSE			# "$(COM)"=="GCC"
 MOZ_MSVCVERSION= 9
 .EXPORT : MOZ_MSVCVERSION
-moz_build:=$(shell cygpath -p $(MOZILLABUILD))
+nss_build:=$(shell cygpath -p $(NSSBUILDTOOLS))
 
 #Using WINNT will cause at least that nspr4.dll, plc4.dll, plds4.dll 
 #become libnspr4.dll, libplc4.dll, libplds4.dll
@@ -234,7 +234,7 @@ PASS_USE_64=USE_64=1
 .ENDIF
 
 NSS_BUILD_DIR=$(ABS_PACKAGE_DIR)/$(TARFILE_ROOTDIR)/mozilla/security/nss
-BUILD_ACTION= PATH="$(moz_build)/msys/bin:$(moz_build)/moztools/bin:$(PATH)" && $(MOZILLABUILD)/msys/bin/bash -i \
+BUILD_ACTION= PATH="$(nss_build)/msys/bin:$(nss_build)/moztools/bin:$(PATH)" && $(NSSBUILDTOOLS)/msys/bin/bash -i \
     -c "cd $(NSS_BUILD_DIR) && make $(PASS_USE_64) nss_build_all"
 
 OUT2LIB= \