# HG changeset patch # User ihse # Date 1476172190 -7200 # Node ID 2b9154b407e62c59507350555b17e7d21bb37891 # Parent 0875007901f7d364a08220b052f0c81003e9c8c5 8167424: Various trivial fixes in build system Reviewed-by: erikj, tbell diff -r 0875007901f7 -r 2b9154b407e6 hotspot/make/lib/CompileGtest.gmk --- a/hotspot/make/lib/CompileGtest.gmk Wed Jul 05 22:19:47 2017 +0200 +++ b/hotspot/make/lib/CompileGtest.gmk Tue Oct 11 09:49:50 2016 +0200 @@ -69,7 +69,7 @@ CFLAGS := $(JVM_CFLAGS) -I$(GTEST_FRAMEWORK_SRC) \ -I$(GTEST_FRAMEWORK_SRC)/include \ $(addprefix -I,$(GTEST_TEST_SRC)), \ - CFLAGS_windows := /EHsc, \ + CFLAGS_windows := -EHsc, \ CFLAGS_solaris := -DGTEST_HAS_EXCEPTIONS=0 -library=stlport4, \ CFLAGS_macosx := -DGTEST_OS_MAC=1, \ CFLAGS_DEBUG_SYMBOLS := $(JVM_CFLAGS_SYMBOLS), \