< prev index next >

make/hotspot/lib/CompileGtest.gmk

Print this page

        

*** 1,7 **** # ! # Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as # published by the Free Software Foundation. Oracle designates this --- 1,7 ---- # ! # Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as # published by the Free Software Foundation. Oracle designates this
*** 29,47 **** GTEST_LAUNCHER_SRC := $(TOPDIR)/test/hotspot/gtest/gtestLauncher.cpp GTEST_FRAMEWORK_SRC := $(TOPDIR)/test/fmw/gtest # On Windows, there are no internal debug symbols so must set copying to true # to get any at all. ! ifeq ($(call isTargetOs, windows), true) GTEST_COPY_DEBUG_SYMBOLS := true else GTEST_COPY_DEBUG_SYMBOLS := false endif ################################################################################ ! ifeq ($(call isTargetOs, windows), true) GTEST_JVM_MAPFILE := $(JVM_MAPFILE) else GTEST_JVM_MAPFILE := $(JVM_OUTPUTDIR)/gtest/mapfile $(JVM_OUTPUTDIR)/gtest/symbols: $(JVM_OUTPUTDIR)/symbols --- 29,47 ---- GTEST_LAUNCHER_SRC := $(TOPDIR)/test/hotspot/gtest/gtestLauncher.cpp GTEST_FRAMEWORK_SRC := $(TOPDIR)/test/fmw/gtest # On Windows, there are no internal debug symbols so must set copying to true # to get any at all. ! ifeq ($(OPENJDK_TARGET_OS), windows) GTEST_COPY_DEBUG_SYMBOLS := true else GTEST_COPY_DEBUG_SYMBOLS := false endif ################################################################################ ! ifeq ($(OPENJDK_TARGET_OS), windows) GTEST_JVM_MAPFILE := $(JVM_MAPFILE) else GTEST_JVM_MAPFILE := $(JVM_OUTPUTDIR)/gtest/mapfile $(JVM_OUTPUTDIR)/gtest/symbols: $(JVM_OUTPUTDIR)/symbols
*** 62,104 **** OBJECT_DIR := $(JVM_OUTPUTDIR)/gtest/objs, \ SRC := $(GTEST_TEST_SRC), \ EXCLUDES := $(JVM_EXCLUDES), \ EXCLUDE_FILES := gtestLauncher.cpp, \ EXCLUDE_PATTERNS := $(JVM_EXCLUDE_PATTERNS), \ ! EXTRA_FILES := \ ! $(GTEST_FRAMEWORK_SRC)/googletest/src/gtest-all.cc \ ! $(GTEST_FRAMEWORK_SRC)/googlemock/src/gmock-all.cc, \ EXTRA_OBJECT_FILES := $(filter-out %/operator_new$(OBJ_SUFFIX), \ $(BUILD_LIBJVM_ALL_OBJS)), \ ! CFLAGS := $(JVM_CFLAGS) \ ! -I$(GTEST_FRAMEWORK_SRC)/googletest \ ! -I$(GTEST_FRAMEWORK_SRC)/googletest/include \ ! -I$(GTEST_FRAMEWORK_SRC)/googlemock \ ! -I$(GTEST_FRAMEWORK_SRC)/googlemock/include \ $(addprefix -I,$(GTEST_TEST_SRC)), \ CFLAGS_windows := -EHsc, \ CFLAGS_solaris := -DGTEST_HAS_EXCEPTIONS=0 -library=stlport4, \ CFLAGS_macosx := -DGTEST_OS_MAC=1, \ DISABLED_WARNINGS_gcc := $(DISABLED_WARNINGS_gcc) \ undef, \ DISABLED_WARNINGS_clang := $(DISABLED_WARNINGS_clang) \ ! undef switch format-nonliteral tautological-undefined-compare \ ! self-assign-overloaded, \ DISABLED_WARNINGS_solstudio := $(DISABLED_WARNINGS_solstudio) \ identexpected, \ LDFLAGS := $(JVM_LDFLAGS), \ LDFLAGS_solaris := -library=stlport4 $(call SET_SHARED_LIBRARY_ORIGIN), \ LIBS := $(JVM_LIBS), \ OPTIMIZATION := $(JVM_OPTIMIZATION), \ MAPFILE := $(GTEST_JVM_MAPFILE), \ USE_MAPFILE_FOR_SYMBOLS := true, \ COPY_DEBUG_SYMBOLS := $(GTEST_COPY_DEBUG_SYMBOLS), \ ZIP_EXTERNAL_DEBUG_SYMBOLS := false, \ STRIP_SYMBOLS := false, \ PRECOMPILED_HEADER := $(JVM_PRECOMPILED_HEADER), \ ! PRECOMPILED_HEADER_EXCLUDE := gtest-all.cc gmock-all.cc gtestMain.cpp, \ ! DEFINE_THIS_FILE := false, \ )) TARGETS += $(BUILD_GTEST_LIBJVM) ################################################################################ --- 62,99 ---- OBJECT_DIR := $(JVM_OUTPUTDIR)/gtest/objs, \ SRC := $(GTEST_TEST_SRC), \ EXCLUDES := $(JVM_EXCLUDES), \ EXCLUDE_FILES := gtestLauncher.cpp, \ EXCLUDE_PATTERNS := $(JVM_EXCLUDE_PATTERNS), \ ! EXTRA_FILES := $(GTEST_FRAMEWORK_SRC)/src/gtest-all.cc, \ EXTRA_OBJECT_FILES := $(filter-out %/operator_new$(OBJ_SUFFIX), \ $(BUILD_LIBJVM_ALL_OBJS)), \ ! CFLAGS := $(JVM_CFLAGS) -I$(GTEST_FRAMEWORK_SRC) \ ! -I$(GTEST_FRAMEWORK_SRC)/include \ $(addprefix -I,$(GTEST_TEST_SRC)), \ CFLAGS_windows := -EHsc, \ CFLAGS_solaris := -DGTEST_HAS_EXCEPTIONS=0 -library=stlport4, \ CFLAGS_macosx := -DGTEST_OS_MAC=1, \ DISABLED_WARNINGS_gcc := $(DISABLED_WARNINGS_gcc) \ undef, \ DISABLED_WARNINGS_clang := $(DISABLED_WARNINGS_clang) \ ! undef switch format-nonliteral tautological-undefined-compare, \ DISABLED_WARNINGS_solstudio := $(DISABLED_WARNINGS_solstudio) \ identexpected, \ + DISABLED_WARNINGS_microsoft := $(DISABLED_WARNINGS_microsoft) \ + 4996, \ LDFLAGS := $(JVM_LDFLAGS), \ LDFLAGS_solaris := -library=stlport4 $(call SET_SHARED_LIBRARY_ORIGIN), \ LIBS := $(JVM_LIBS), \ OPTIMIZATION := $(JVM_OPTIMIZATION), \ MAPFILE := $(GTEST_JVM_MAPFILE), \ USE_MAPFILE_FOR_SYMBOLS := true, \ COPY_DEBUG_SYMBOLS := $(GTEST_COPY_DEBUG_SYMBOLS), \ ZIP_EXTERNAL_DEBUG_SYMBOLS := false, \ STRIP_SYMBOLS := false, \ PRECOMPILED_HEADER := $(JVM_PRECOMPILED_HEADER), \ ! PRECOMPILED_HEADER_EXCLUDE := gtest-all.cc gtestMain.cpp, \ )) TARGETS += $(BUILD_GTEST_LIBJVM) ################################################################################
*** 108,131 **** NAME := gtestLauncher, \ TYPE := EXECUTABLE, \ OUTPUT_DIR := $(JVM_OUTPUTDIR)/gtest, \ EXTRA_FILES := $(GTEST_LAUNCHER_SRC), \ OBJECT_DIR := $(JVM_OUTPUTDIR)/gtest/launcher-objs, \ ! CFLAGS := $(JVM_CFLAGS) \ ! -I$(GTEST_FRAMEWORK_SRC)/googletest \ ! -I$(GTEST_FRAMEWORK_SRC)/googletest/include \ ! -I$(GTEST_FRAMEWORK_SRC)/googlemock \ ! -I$(GTEST_FRAMEWORK_SRC)/googlemock/include, \ LDFLAGS := $(LDFLAGS_JDKEXE), \ LDFLAGS_unix := -L$(JVM_OUTPUTDIR)/gtest $(call SET_SHARED_LIBRARY_ORIGIN), \ LDFLAGS_solaris := -library=stlport4, \ LIBS_linux := $(LIBCXX), \ LIBS_unix := -ljvm, \ LIBS_windows := $(JVM_OUTPUTDIR)/gtest/objs/jvm.lib, \ COPY_DEBUG_SYMBOLS := $(GTEST_COPY_DEBUG_SYMBOLS), \ ZIP_EXTERNAL_DEBUG_SYMBOLS := false, \ - DEFINE_THIS_FILE := false, \ )) $(BUILD_GTEST_LAUNCHER): $(BUILD_GTEST_LIBJVM) TARGETS += $(BUILD_GTEST_LAUNCHER) --- 103,122 ---- NAME := gtestLauncher, \ TYPE := EXECUTABLE, \ OUTPUT_DIR := $(JVM_OUTPUTDIR)/gtest, \ EXTRA_FILES := $(GTEST_LAUNCHER_SRC), \ OBJECT_DIR := $(JVM_OUTPUTDIR)/gtest/launcher-objs, \ ! CFLAGS := $(JVM_CFLAGS) -I$(GTEST_FRAMEWORK_SRC) \ ! -I$(GTEST_FRAMEWORK_SRC)/include, \ LDFLAGS := $(LDFLAGS_JDKEXE), \ LDFLAGS_unix := -L$(JVM_OUTPUTDIR)/gtest $(call SET_SHARED_LIBRARY_ORIGIN), \ LDFLAGS_solaris := -library=stlport4, \ LIBS_linux := $(LIBCXX), \ LIBS_unix := -ljvm, \ LIBS_windows := $(JVM_OUTPUTDIR)/gtest/objs/jvm.lib, \ COPY_DEBUG_SYMBOLS := $(GTEST_COPY_DEBUG_SYMBOLS), \ ZIP_EXTERNAL_DEBUG_SYMBOLS := false, \ )) $(BUILD_GTEST_LAUNCHER): $(BUILD_GTEST_LIBJVM) TARGETS += $(BUILD_GTEST_LAUNCHER)
< prev index next >