[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[kevino at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 5bf89a53e2baae12092a97082e9484ccbe71cb32
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 30 17:35:10 2010 +0000

    [wx] wxMSW build fix. Make sure we copy the compiler flags and remove exception handling from
    the copy so as not to alter global settings.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68799 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index e793955..43d0633 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-30  Kevin Ollivier  <kevino at theolliviers.com>
+
+        [wx] wxMSW build fix. Make sure we copy the compiler flags and remove exception handling from
+        the copy so as not to alter global settings.
+
+        * wscript:
+
 2010-09-30  Peter Varga  <pvarga at inf.u-szeged.hu>
 
         Reviewed by Gavin Barraclough.
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')

-- 
WebKit Debian packaging