From 3969ef923e1d339b270e7e1ce419a65959238eac Mon Sep 17 00:00:00 2001
From: "J.C. Jones" <jjones@mozilla.com>
Date: Thu, 24 Jan 2019 14:04:54 -0700
Subject: Bug 1515236 - Centralize a SSLKEYLOGFILE enable/disable flag at
 build.sh r=mt

Backs out backout 31656990b5d083f97aecc3bb9ff0685e7f444bbb

Differential Revision: https://phabricator.services.mozilla.com/D17380
---
 build.sh | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 37ff9708c..0b6fec83a 100755
--- a/build.sh
+++ b/build.sh
@@ -50,6 +50,7 @@ fuzz=0
 fuzz_tls=0
 fuzz_oss=0
 no_local_nspr=0
+sslkeylogfile=1
 
 gyp_params=(--depth="$cwd" --generator-output=".")
 ninja_params=()
@@ -103,6 +104,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) ;;
+        --disable-keylog) sslkeylogfile=0 ;;
 	-D*) gyp_params+=("$1") ;;
         *) show_help; exit 2 ;;
     esac
@@ -117,6 +119,8 @@ else
     target=Debug
 fi
 
+gyp_params+=(-Denable_sslkeylogfile="$sslkeylogfile")
+
 # Do special setup.
 if [ "$fuzz" = 1 ]; then
     source "$cwd"/coreconf/fuzz.sh
-- 
cgit v1.2.1