Issue #1338 - Part 2: Update NSS to 3.48-RTM

1 files changed, 15 insertions, 6 deletions

diff --git a/security/nss/help.txt b/security/nss/help.txt
index 1df72736e..6f5ff2d04 100644
--- a/security/nss/help.txt
+++ b/security/nss/help.txt
@@ -1,12 +1,13 @@
 Usage: build.sh [-h] [-c|-cc] [-v] [-j <n>] [--gyp|-g] [--opt|-o]
-                [-t <x64|x86|...>|--target=<x64|x86|...>]
+                [-t <x64|ia32|...>|--target=<x64|ia32|...>]
                 [--clang|--gcc|--msvc] [--scan-build[=dir]] [--disable-tests]
                 [--pprof] [--asan] [--msan] [--ubsan[=bool,shift,...]
                 [--fuzz[=tls|oss]] [--sancov[=edge|bb|func|...]]
-                [--emit-llvm] [--no-zdefs] [--test] [--ct-verif]
+                [--emit-llvm] [--no-zdefs] [--static] [--ct-verif]
                 [--nspr|--with-nspr=<include>:<lib>|--system-nspr]
                 [--system-sqlite] [--enable-fips] [--enable-libpkix]
-                [--mozpkix-only]
+                [--mozpkix-only] [-D<gyp-option>]
+                [--rebuild]
 
 This script builds NSS with gyp and ninja.
 
@@ -19,7 +20,7 @@ NSS build tool options:
     -j <n>           run at most <n> concurrent jobs
     --gyp|-g         force a rerun of gyp
     --opt|-o         do an opt build
-    --target|-t      specify target architecture (e.g., x86, x64, aarch64)
+    --target|-t      specify target architecture (e.g., ia32, x64, aarch64)
     --clang          build with clang and clang++
     --gcc            build with gcc and g++
     --msvc           build with MSVC
@@ -31,7 +32,7 @@ NSS build tool options:
     --msan           enable memory sanitizer
     --ubsan          enable undefined behavior sanitizer
                      --ubsan=bool,shift,... sets specific UB sanitizers
-    --fuzz           build fuzzing targets (this always enables test builds)
+    --fuzz           build fuzzing targets (this always enables static builds)
                      --fuzz=tls to enable TLS fuzzing mode
                      --fuzz=oss to build for OSS-Fuzz
     --sancov         do sanitize coverage builds
@@ -39,9 +40,12 @@ NSS build tool options:
     --emit-llvm      emit LLVM bitcode while building
                      (requires the gold linker, use clang-3.8 for SAW)
     --no-zdefs       don't set -Wl,-z,defs
-    --test           ignore map files and export everything we have
+    --static         create static libraries and use static linking
     --ct-verif       build with valgrind for ct-verif
     --nspr           force a rebuild of NSPR
+    --nspr-test-build when building NSPR also build its tests
+    --nspr-test-run  when building NSPR tests also run its tests
+    --nspr-only      exit after building NSPR
     --with-nspr      use the NSPR build at the given locations
                      --with-nspr=<include>:<lib> sets include and lib paths
     --system-nspr    attempt to use system nspr
@@ -51,3 +55,8 @@ NSS build tool options:
     --enable-libpkix make libpkix part of the build
     --mozpkix-only   build only static mozpkix and mozpkix-test libraries
                      support for this build option is limited
+    --disable-keylog disable support for logging key data to a file specified
+                     by the SSLKEYLOGFILE environment variable
+    -D<gyp-option>   pass an option directly to gyp
+    --rebuild        build again using the last set of options provided
+                     (all other arguments are ignored if --rebuild is used)