Bug 1256604 - Remove toolkit/content/Makefile.in and move setting CXX…

…FLAGS for buildconfig.html to moz.build r=mshal

MozReview-Commit-ID: FZ6MTVAWSZa

--HG--
extra : rebase_source : ed71a72ec0430aed072321b0151b9efd229f940d

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

toolkit/content/buildconfig.html

@@ -50,9 +50,7 @@ <h2>Build tools</h2>
     <tr>
       <td>@CXX@</td>
       <td>@CC_VERSION@</td>
-#ifndef BUILD_FASTER
-      <td>@CXXFLAGS@ @CPPFLAGS@</td>
-#endif
+      <td>@CXXFLAGS@</td>
     </tr>
   </tbody>
 </table>

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