From 4894ea0933481dfe7e6413a6630ffdddb71ce85e Mon Sep 17 00:00:00 2001
From: Chris Manchester <cmanchester@mozilla.com>
Date: Thu, 9 Nov 2017 10:45:00 -0800
Subject: [PATCH] Bug 1256604 - Remove toolkit/content/Makefile.in and move
 setting CXXFLAGS for buildconfig.html to moz.build r=mshal

MozReview-Commit-ID: FZ6MTVAWSZa

--HG--
extra : rebase_source : ed71a72ec0430aed072321b0151b9efd229f940d
---
 config/faster/rules.mk           | 3 +--
 toolkit/content/Makefile.in      | 9 ---------
 toolkit/content/buildconfig.html | 4 +---
 toolkit/content/moz.build        | 6 ++++++
 4 files changed, 8 insertions(+), 14 deletions(-)
 delete mode 100644 toolkit/content/Makefile.in

diff --git a/config/faster/rules.mk b/config/faster/rules.mk
index 56db1c6429af..7ed77ec71b55 100644
--- a/config/faster/rules.mk
+++ b/config/faster/rules.mk
@@ -59,8 +59,7 @@ endif
 .PHONY: FORCE
 
 # Extra define to trigger some workarounds. We should strive to limit the
-# use of those. As of writing the only ones are in
-# toolkit/content/buildconfig.html and browser/locales/jar.mn.
+# use of those. As of writing the only one is in browser/locales/jar.mn.
 ACDEFINES += -DBUILD_FASTER
 
 # Files under the faster/ sub-directory, however, are not meant to use the
diff --git a/toolkit/content/Makefile.in b/toolkit/content/Makefile.in
deleted file mode 100644
index 0e0e6316dc71..000000000000
--- a/toolkit/content/Makefile.in
+++ /dev/null
@@ -1,9 +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/.
-
-DEFINES += \
-  -DCXXFLAGS='$(CXXFLAGS)' \
-  -DCPPFLAGS='$(CPPFLAGS)' \
-  $(NULL)
diff --git a/toolkit/content/buildconfig.html b/toolkit/content/buildconfig.html
index d3373f54c1ef..ea7109a879ec 100644
--- a/toolkit/content/buildconfig.html
+++ b/toolkit/content/buildconfig.html
@@ -50,9 +50,7 @@
     <tr>
       <td>@CXX@</td>
       <td>@CC_VERSION@</td>
-#ifndef BUILD_FASTER
-      <td>@CXXFLAGS@ @CPPFLAGS@</td>
-#endif
+      <td>@CXXFLAGS@</td>
     </tr>
   </tbody>
 </table>
diff --git a/toolkit/content/moz.build b/toolkit/content/moz.build
index ae9f15271fc1..1fc92a21e246 100644
--- a/toolkit/content/moz.build
+++ b/toolkit/content/moz.build
@@ -11,6 +11,12 @@ for var in ('target', 'MOZ_CONFIGURE_OPTIONS', 'CC', 'CC_VERSION', 'CXX'):
 
 DEFINES['CFLAGS'] = ' '.join(CONFIG['OS_CFLAGS'])
 
+cxx_flags = []
+for var in ('OS_CPPFLAGS', 'OS_CXXFLAGS', 'DEBUG', 'OPTIMIZE', 'FRAMEPTR'):
+    cxx_flags += COMPILE_FLAGS.get(var, [])
+
+DEFINES['CXXFLAGS'] = ' '.join(cxx_flags)
+
 if CONFIG['OS_TARGET'] == 'Android':
     DEFINES['ANDROID_PACKAGE_NAME'] = CONFIG['ANDROID_PACKAGE_NAME']
     DEFINES['MOZ_USE_LIBCXX'] = True