Bug 1411712 - Move libfuzzer ldflags filtering to moz.build. draft
authorChris Manchester <cmanchester@mozilla.com>
Thu, 02 Nov 2017 14:14:59 -0700
changeset 692251 c88d767e07bf88af28f9c9d9c9790a18e811da90
parent 692250 b16038af4f242f4623b5e8d89b359874c1b53cd2
child 692252 86e1f60acc3ef053d292eb5d3b5b348ffcdbbace
push id87463
push userbmo:cmanchester@mozilla.com
push dateThu, 02 Nov 2017 21:50:29 +0000
bugs1411712
milestone58.0a1
Bug 1411712 - Move libfuzzer ldflags filtering to moz.build. MozReview-Commit-ID: 50aeTifZ1gT
tools/fuzzing/libfuzzer/Makefile.in
tools/fuzzing/libfuzzer/moz.build
deleted file mode 100644
--- a/tools/fuzzing/libfuzzer/Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-include $(topsrcdir)/config/rules.mk
-
-# According to the LLVM docs, LibFuzzer isn't supposed to be built with any
-# sanitizer flags and in fact, building it with ASan coverage currently causes
-# Clang 3.9+ to crash, so we filter out all sanitizer-related flags here.
-LDFLAGS := $(filter-out -fsanitize%,$(LDFLAGS))
--- a/tools/fuzzing/libfuzzer/moz.build
+++ b/tools/fuzzing/libfuzzer/moz.build
@@ -42,8 +42,13 @@ if CONFIG['CLANG_CXX']:
 # According to the LLVM docs, LibFuzzer isn't supposed to be built with any
 # sanitizer flags and in fact, building it with ASan coverage currently causes
 # Clang 3.9+ to crash, so we filter out all sanitizer-related flags here.
 for flags_var in ('OS_CFLAGS', 'OS_CXXFLAGS'):
     COMPILE_FLAGS[flags_var] = [
         f for f in COMPILE_FLAGS.get(flags_var, [])
         if not f.startswith('-fsanitize')
     ]
+
+LINK_FLAGS['OS'] = [
+    f for f in LINK_FLAGS.get('OS', [])
+    if not f.startswith('-fsanitize')
+]