From cc5ca8bd39b1caa65291f507e81a73bd863f5d94 Mon Sep 17 00:00:00 2001 From: Jonathan Watt Date: Wed, 31 Oct 2018 14:19:51 +0000 Subject: [PATCH] Bug 1408675 p3. Have Eclipse CDT globally set MOZILLA_CLIENT and the NSS include path. r=botond Differential Revision: https://phabricator.services.mozilla.com/D12010 --HG-- extra : rebase_source : efca8735223d8e6e18085cd75b2a30c4220e721d extra : intermediate-source : 9930d9d71cdf677490cf2a66bd66cc481be88880 extra : source : c2d648eaa388362a034164500fcf807050358fc9 --- python/mozbuild/mozbuild/backend/cpp_eclipse.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python/mozbuild/mozbuild/backend/cpp_eclipse.py b/python/mozbuild/mozbuild/backend/cpp_eclipse.py index 720ef39d5c27..6bfdbdf9dd67 100644 --- a/python/mozbuild/mozbuild/backend/cpp_eclipse.py +++ b/python/mozbuild/mozbuild/backend/cpp_eclipse.py @@ -233,6 +233,7 @@ class CppEclipseBackend(CommonBackend): # Add OS_COMPILE_CXXFLAGS args (same as OS_COMPILE_CFLAGS): dirsettings_template = dirsettings_template.replace('@PREINCLUDE_FILE_PATH@', os.path.join(self.environment.topobjdir, 'dist/include/mozilla-config.h')) + dirsettings_template += add_define('MOZILLA_CLIENT', '1') # Add EXTRA_INCLUDES args: dirsettings_template += add_objdir_include_path('dist/include') @@ -240,6 +241,7 @@ class CppEclipseBackend(CommonBackend): # Add OS_INCLUDES args: # XXX media/webrtc/trunk/webrtc's moz.builds reset this. dirsettings_template += add_objdir_include_path('dist/include/nspr') + dirsettings_template += add_objdir_include_path('dist/include/nss') # Finally, add anything else that makes things work better. #