diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
| commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
| tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /JavaScriptCore/wscript | |
| parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
| download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 | |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'JavaScriptCore/wscript')
| -rw-r--r-- | JavaScriptCore/wscript | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/JavaScriptCore/wscript b/JavaScriptCore/wscript index d85364c..8d7f69c 100644 --- a/JavaScriptCore/wscript +++ b/JavaScriptCore/wscript @@ -75,10 +75,10 @@ def build(bld): install_path = output_dir, ) - # we'll get an error if exceptions are on because of an unwind error when using __try if building_on_win32: - flags = obj.env.CXXFLAGS - flags.remove('/EHsc') - obj.env.CXXFLAGS = flags + myenv = obj.env.copy() + myenv.CXXFLAGS = myenv.CXXFLAGS[:] + myenv.CXXFLAGS.remove('/EHsc') + obj.env = myenv bld.install_files(os.path.join(output_dir, 'JavaScriptCore'), 'API/*.h') |