enable cxx exceptions bu default

3 files changed, 6 insertions, 6 deletions

diff --git a/xmake/rules/c++/xmake.lua b/xmake/rules/c++/xmake.lua
index 2f7977768..3d160ab65 100644
--- a/xmake/rules/c++/xmake.lua
+++ b/xmake/rules/c++/xmake.lua
@@ -27,6 +27,12 @@ rule("c++.build")
     set_sourcekinds("cxx")
     add_deps("c++.build.pcheader", "c++.build.modules", "c++.build.optimization")
     on_build_files("private.action.build.object", {batch = true, distcc = true})
+    on_config(function (target)
+        -- we enable c++ exceptions by default
+        if target:is_plat("windows") and not target:get("exceptions") then
+            target:set("exceptions", "cxx")
+        end
+    end)
 
 rule("c++")
 
diff --git a/xmake/toolchains/clang-cl/load.lua b/xmake/toolchains/clang-cl/load.lua
index b2db0761e..5e38f0010 100644
--- a/xmake/toolchains/clang-cl/load.lua
+++ b/xmake/toolchains/clang-cl/load.lua
@@ -65,8 +65,5 @@ function main(toolchain)
             _add_vsenv(toolchain, name)
         end
     end
-
-    -- add some default flags
-    toolchain:add("clang_cl.cxxflags", "/EHsc")
 end
 
diff --git a/xmake/toolchains/msvc/load.lua b/xmake/toolchains/msvc/load.lua
index 74e119e35..51b851c00 100644
--- a/xmake/toolchains/msvc/load.lua
+++ b/xmake/toolchains/msvc/load.lua
@@ -69,8 +69,5 @@ function main(toolchain)
             _add_vsenv(toolchain, name)
         end
     end
-
-    -- add some default flags
-    toolchain:add("cl.cxxflags", "/EHsc")
 end