From 5ec0cbed4c6ae1641ca1e1c6f4567b5f3f670435 Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Thu, 17 May 2012 11:16:16 +0200 Subject: [PATCH] self.env->env when looking for defines in parse_flags --- waflib/Tools/c_config.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/waflib/Tools/c_config.py b/waflib/Tools/c_config.py index 636546d7..46a188dd 100644 --- a/waflib/Tools/c_config.py +++ b/waflib/Tools/c_config.py @@ -134,7 +134,7 @@ def parse_flags(self, line, uselib, env=None, force_static=False): tmp = [x, lst.pop(0)] app('CFLAGS', tmp) app('CXXFLAGS', tmp) - elif st == '-D' or (self.env.CXX_NAME == 'msvc' and st == '/D'): # not perfect but.. + elif st == '-D' or (env.CXX_NAME == 'msvc' and st == '/D'): # not perfect but.. if not ot: ot = lst.pop(0) app('DEFINES_' + uselib, [ot]) elif st == '-l': @@ -367,8 +367,6 @@ def validate_c(self, kw): """ pre-check the parameters that will be given to run_c_code - :param env: an optional environment (modified -> provide a copy) - :type env: :py:class:`waflib.ConfigSet.ConfigSet` :param compiler: c or cxx (tries to guess what is best) :type compiler: string :param type: cprogram, cshlib, cstlib - not required if *features are given directly*