Skip to content

Commit 1759142

Browse files
committed
Disable structured exception handling in gtests on Windows
1 parent 5fd2b7d commit 1759142

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

make/hotspot/lib/CompileGtest.gmk

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ $(eval $(call SetupJdkLibrary, BUILD_GTEST_LIBGTEST, \
6868
-I$(GTEST_FRAMEWORK_SRC)/googletest/include \
6969
-I$(GTEST_FRAMEWORK_SRC)/googlemock \
7070
-I$(GTEST_FRAMEWORK_SRC)/googlemock/include, \
71-
CFLAGS_windows := -EHsc, \
71+
CFLAGS_windows := -EHsc -DGTEST_HAS_SEH=0, \
7272
CFLAGS_macosx := -DGTEST_OS_MAC=1, \
7373
OPTIMIZATION := $(JVM_OPTIMIZATION), \
7474
COPY_DEBUG_SYMBOLS := $(GTEST_COPY_DEBUG_SYMBOLS), \
@@ -98,7 +98,7 @@ $(eval $(call SetupJdkLibrary, BUILD_GTEST_LIBJVM, \
9898
-I$(GTEST_FRAMEWORK_SRC)/googletest/include \
9999
-I$(GTEST_FRAMEWORK_SRC)/googlemock/include \
100100
$(addprefix -I, $(GTEST_TEST_SRC)), \
101-
CFLAGS_windows := -EHsc, \
101+
CFLAGS_windows := -EHsc -DGTEST_HAS_SEH=0, \
102102
CFLAGS_macosx := -DGTEST_OS_MAC=1, \
103103
DISABLED_WARNINGS_gcc := $(DISABLED_WARNINGS_gcc) \
104104
undef stringop-overflow, \
@@ -152,6 +152,7 @@ $(eval $(call SetupJdkExecutable, BUILD_GTEST_LAUNCHER, \
152152
-I$(GTEST_FRAMEWORK_SRC)/googletest/include \
153153
-I$(GTEST_FRAMEWORK_SRC)/googlemock \
154154
-I$(GTEST_FRAMEWORK_SRC)/googlemock/include, \
155+
CFLAGS_windows := -DGTEST_HAS_SEH=0, \
155156
LD_SET_ORIGIN := false, \
156157
LDFLAGS_unix := $(call SET_SHARED_LIBRARY_ORIGIN), \
157158
JDK_LIBS := gtest:libjvm, \

0 commit comments

Comments
 (0)