diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-03-24 19:43:21 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-04-04 23:38:36 +0530 |
| commit | 6042e21e25e31d4bb794ab83237beac511a15837 (patch) | |
| tree | 09934d50be897233b3044ce3fbf995ebd273a164 /mesonbuild/coredata.py | |
| parent | 09fee02dd9484e682401469ff890cf99ef5fa56a (diff) | |
| download | meson-6042e21e25e31d4bb794ab83237beac511a15837.tar.gz | |
Use CPPFLAGS for pre-processor compiler checks
Also don't add CFLAGS twice for links() checks
Includes a test for this.
Diffstat (limited to 'mesonbuild/coredata.py')
| -rw-r--r-- | mesonbuild/coredata.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index 67516e78f..27f1dd7a4 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -148,10 +148,11 @@ class CoreData: self.user_options = {} self.compiler_options = {} self.base_options = {} - # These two, external_*args, are set via env vars CFLAGS, LDFLAGS, etc + # These external_*args, are set via env vars CFLAGS, LDFLAGS, etc # but only when not cross-compiling. - self.external_args = {} - self.external_link_args = {} + self.external_preprocess_args = {} # CPPFLAGS only + self.external_args = {} # CPPFLAGS + CFLAGS + self.external_link_args = {} # CFLAGS + LDFLAGS (with MSVC: only LDFLAGS) if options.cross_file is not None: self.cross_file = os.path.join(os.getcwd(), options.cross_file) else: |