8167424: Various trivial fixes in build system
Reviewed-by: erikj, tbell
This commit is contained in:
parent
e91b43837d
commit
a6aec9bc10
@ -69,7 +69,7 @@ $(eval $(call SetupNativeCompilation, BUILD_GTEST_LIBJVM, \
|
|||||||
CFLAGS := $(JVM_CFLAGS) -I$(GTEST_FRAMEWORK_SRC) \
|
CFLAGS := $(JVM_CFLAGS) -I$(GTEST_FRAMEWORK_SRC) \
|
||||||
-I$(GTEST_FRAMEWORK_SRC)/include \
|
-I$(GTEST_FRAMEWORK_SRC)/include \
|
||||||
$(addprefix -I,$(GTEST_TEST_SRC)), \
|
$(addprefix -I,$(GTEST_TEST_SRC)), \
|
||||||
CFLAGS_windows := /EHsc, \
|
CFLAGS_windows := -EHsc, \
|
||||||
CFLAGS_solaris := -DGTEST_HAS_EXCEPTIONS=0 -library=stlport4, \
|
CFLAGS_solaris := -DGTEST_HAS_EXCEPTIONS=0 -library=stlport4, \
|
||||||
CFLAGS_macosx := -DGTEST_OS_MAC=1, \
|
CFLAGS_macosx := -DGTEST_OS_MAC=1, \
|
||||||
CFLAGS_DEBUG_SYMBOLS := $(JVM_CFLAGS_SYMBOLS), \
|
CFLAGS_DEBUG_SYMBOLS := $(JVM_CFLAGS_SYMBOLS), \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user