From c57f8ae0a6413f4f0ae4e3e266ab45cd52aa3a89 Mon Sep 17 00:00:00 2001
From: Phil Turnbull <philipturnbull@github.com>
Date: Wed, 6 Sep 2017 09:42:41 -0700
Subject: [PATCH 1/2] Allow fuzzer CFLAGS to be overridden by envrionment

---
 project.gyp          | 4 ++--
 script/build-fuzzers | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/project.gyp b/project.gyp
index 7ae20e54..ffceb80b 100644
--- a/project.gyp
+++ b/project.gyp
@@ -136,8 +136,8 @@
         },
       },
       'Fuzz': {
-        'cflags': [ '-g', '-fsanitize=address,undefined', '-fsanitize-coverage=trace-pc-guard' ],
-        'ldflags': [ '-g', '-fsanitize=address,undefined', '-fsanitize-coverage=trace-pc-guard' ],
+        'cflags': ['<!@(echo $CFLAGS)'],
+        'ldflags': ['<!@(echo $CXXFLAGS)'],
       },
       'Release': {
         'cflags': [ '-O2', '-fno-strict-aliasing' ],
diff --git a/script/build-fuzzers b/script/build-fuzzers
index 8e8de5a6..d4786daf 100755
--- a/script/build-fuzzers
+++ b/script/build-fuzzers
@@ -15,13 +15,16 @@ CC=${CC:-clang}
 CXX=${CXX:-clang++}
 LINK=${LINK:-clang++}
 
-CC=$CC CXX=$CXX LINK=$LINK ./script/configure
+default_fuzz_flags="-fsanitize=address,undefined -fsanitize-coverage=trace-pc-guard"
+
+CFLAGS=${CFLAGS:-"$default_fuzz_flags"}
+CXXFLAGS=${CXXFLAGS:-"$default_fuzz_flags"}
+
+CC=$CC CXX=$CXX LINK=$LINK CFLAGS=$CFLAGS CXXFLAGS=$CXXFLAGS ./script/configure
 
 export BUILDTYPE=Fuzz
 make runtime
 
-CFLAGS="-fsanitize=address,undefined -fsanitize-coverage=trace-pc-guard"
-CXXFLAGS="-fsanitize=address,undefined -fsanitize-coverage=trace-pc-guard"
 
 if [ -z "$@" ]; then
   languages=$(ls test/fixtures/grammars)

From f08402014bef12e84df8d87ad0b1b5876177161b Mon Sep 17 00:00:00 2001
From: Phil Turnbull <philipturnbull@github.com>
Date: Fri, 15 Sep 2017 10:06:17 -0400
Subject: [PATCH 2/2] Fuzz build should use CFLAGS when linking

---
 project.gyp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.gyp b/project.gyp
index ffceb80b..a4a0499b 100644
--- a/project.gyp
+++ b/project.gyp
@@ -137,7 +137,7 @@
       },
       'Fuzz': {
         'cflags': ['<!@(echo $CFLAGS)'],
-        'ldflags': ['<!@(echo $CXXFLAGS)'],
+        'ldflags': ['<!@(echo $CFLAGS)'],
       },
       'Release': {
         'cflags': [ '-O2', '-fno-strict-aliasing' ],