Skip to content

Commit

Permalink
Bug 1528669 - Pass -D options directly to gyp, r=jcj
Browse files Browse the repository at this point in the history
Reviewers: jcj

Reviewed By: jcj

Bug #: 1528669

Differential Revision: https://phabricator.services.mozilla.com/D20120

--HG--
extra : rebase_source : e604b49744e9180e85be96c51e83be6710add826
extra : amend_source : 6090c9c4d9b60bfb93a102dea633a0c5a30a87bd
  • Loading branch information
martinthomson committed Feb 25, 2019
1 parent 5eb5e02 commit 2b7e5b9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions build.sh
Expand Up @@ -103,6 +103,7 @@ while [ $# -gt 0 ]; do
--enable-fips) gyp_params+=(-Ddisable_fips=0) ;;
--enable-libpkix) gyp_params+=(-Ddisable_libpkix=0) ;;
--mozpkix-only) gyp_params+=(-Dmozpkix_only=1 -Ddisable_tests=1 -Dsign_libs=0) ;;
-D*) gyp_params+=("$1") ;;
*) show_help; exit 2 ;;
esac
shift
Expand Down
3 changes: 2 additions & 1 deletion help.txt
Expand Up @@ -6,7 +6,7 @@ Usage: build.sh [-h] [-c|-cc] [-v] [-j <n>] [--gyp|-g] [--opt|-o]
[--emit-llvm] [--no-zdefs] [--test] [--ct-verif]
[--nspr|--with-nspr=<include>:<lib>|--system-nspr]
[--system-sqlite] [--enable-fips] [--enable-libpkix]
[--mozpkix-only]
[--mozpkix-only] [-D<gyp-option>]

This script builds NSS with gyp and ninja.

Expand Down Expand Up @@ -51,3 +51,4 @@ 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
-D<gyp-option> pass an option directly to gyp

0 comments on commit 2b7e5b9

Please sign in to comment.