From e36131899058680e6ea3b5e2e41e570c36aba07a Mon Sep 17 00:00:00 2001 From: Chris Manchester Date: Wed, 25 Oct 2017 15:12:10 -0700 Subject: [PATCH] Bug 1403346 - Remove clang plugin flags from stdc++compat through moz.build rather than Makefile.in r=glandium MozReview-Commit-ID: DuFMdNru2i4 --- build/unix/stdc++compat/Makefile.in | 7 ------- build/unix/stdc++compat/moz.build | 1 + 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 build/unix/stdc++compat/Makefile.in diff --git a/build/unix/stdc++compat/Makefile.in b/build/unix/stdc++compat/Makefile.in deleted file mode 100644 index 054c1c023e2b..000000000000 --- a/build/unix/stdc++compat/Makefile.in +++ /dev/null @@ -1,7 +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/. - -ENABLE_CLANG_PLUGIN := - -include $(topsrcdir)/config/rules.mk diff --git a/build/unix/stdc++compat/moz.build b/build/unix/stdc++compat/moz.build index 481f992ffbb6..20517a1caef5 100644 --- a/build/unix/stdc++compat/moz.build +++ b/build/unix/stdc++compat/moz.build @@ -19,6 +19,7 @@ FORCE_STATIC_LIB = True NO_PGO = True DisableStlWrapping() +COMPILE_FLAGS['CLANG_PLUGIN'] = [] DEFINES['MOZ_LIBSTDCXX_VERSION'] = CONFIG['MOZ_LIBSTDCXX_TARGET_VERSION'] HOST_DEFINES['MOZ_LIBSTDCXX_VERSION'] = CONFIG['MOZ_LIBSTDCXX_HOST_VERSION']