From b1a1956193945305d741f9bb175ad9be80536d41 Mon Sep 17 00:00:00 2001
From: Franziskus Kiefer <franziskuskiefer@gmail.com>
Date: Thu, 17 Nov 2016 09:40:29 +0100
Subject: [PATCH] some build.sh fixes and improvements, r=me

---
 build.sh                 | 6 +++---
 gtests/common/common.gyp | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/build.sh b/build.sh
index ec6901f0e2..2d48a01bbb 100755
--- a/build.sh
+++ b/build.sh
@@ -49,11 +49,11 @@ build_64=0
 clean=0
 rebuild_gyp=0
 target=Debug
-params=$(echo "$* $CC $CCC" | tr " " "\n")
 verbose=0
 
-cwd=$(cd $(dirname $0); pwd -P)
-dist_dir="$cwd/../dist"
+# parse parameters to store in config
+params=$(echo "$*" | sed -e 's/-c\|-v\|-g\|-j [0-9]*\|-h//g' -e 's/^[ \t]*//')
+params=$(echo "$params $CC $CCC" | tr " " "\n" | sed -e '/^\s*$/d')
 
 cwd=$(cd $(dirname $0); pwd -P)
 dist_dir="$cwd/../dist"
diff --git a/gtests/common/common.gyp b/gtests/common/common.gyp
index 274033ad5f..c501eba6bc 100644
--- a/gtests/common/common.gyp
+++ b/gtests/common/common.gyp
@@ -18,7 +18,6 @@
         '<(DEPTH)/lib/nss/nss.gyp:nss3',
         '<(DEPTH)/lib/util/util.gyp:nssutil3',
         '<(DEPTH)/lib/smime/smime.gyp:smime3',
-        '<(DEPTH)/lib/ssl/ssl.gyp:ssl3',
         '<(DEPTH)/gtests/google_test/google_test.gyp:gtest',
         '<(DEPTH)/cmd/lib/lib.gyp:sectool'
       ]