Revision: 2750 Author: [email protected] Date: Mon Aug 24 23:31:17 2009 Log: Land patch for [email protected]:
Don't copy the ENV variable from the users's external environment into construction environments. SCons uses this as a dictionary of environment values for the commands it executes. BUG=none TEST=build with the variable ENV set in the user environment Review URL: http://codereview.chromium.org/173294 http://code.google.com/p/v8/source/detail?r=2750 Modified: /branches/bleeding_edge/SConstruct ======================================= --- /branches/bleeding_edge/SConstruct Fri Aug 14 10:19:51 2009 +++ /branches/bleeding_edge/SConstruct Mon Aug 24 23:31:17 2009 @@ -789,12 +789,20 @@ context = BuildContext(options, env_overrides, samples=SplitList(env['sample'])) - library_flags = context.AddRelevantFlags(os.environ, LIBRARY_FLAGS) + # Remove variables which can't be imported from the user's external + # environment into a construction environment. + user_environ = os.environ.copy() + try: + del user_environ['ENV'] + except KeyError: + pass + + library_flags = context.AddRelevantFlags(user_environ, LIBRARY_FLAGS) v8_flags = context.AddRelevantFlags(library_flags, V8_EXTRA_FLAGS) mksnapshot_flags = context.AddRelevantFlags(library_flags, MKSNAPSHOT_EXTRA_FLAGS) dtoa_flags = context.AddRelevantFlags(library_flags, DTOA_EXTRA_FLAGS) cctest_flags = context.AddRelevantFlags(v8_flags, CCTEST_EXTRA_FLAGS) - sample_flags = context.AddRelevantFlags(os.environ, SAMPLE_FLAGS) + sample_flags = context.AddRelevantFlags(user_environ, SAMPLE_FLAGS) d8_flags = context.AddRelevantFlags(library_flags, D8_FLAGS) context.flags = { --~--~---------~--~----~------------~-------~--~----~ v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev -~----------~----~----~----~------~----~------~--~---
