stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8299789: Compilation of gtest causes build to fail if runtime libraries are in different dirs

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Sergey Bylokhov 2023-01-10 10:30:34 +00:00
parent 5f37cbec94
commit c8a8388aba
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
make/hotspot/test/GtestImage.gmk
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -41,10 +41,22 @@ ifeq ($(call isTargetOs, windows), true)
$(foreach v, $(JVM_VARIANTS), \ $(foreach v, $(JVM_VARIANTS), \
$(eval $(call SetupCopyFiles, COPY_GTEST_MSVCR_$v, \ $(eval $(call SetupCopyFiles, COPY_GTEST_MSVCR_$v, \
DEST := $(TEST_IMAGE_DIR)/hotspot/gtest/$v, \ DEST := $(TEST_IMAGE_DIR)/hotspot/gtest/$v, \
FILES := $(MSVCR_DLL) $(VCRUNTIME_1_DLL) $(MSVCP_DLL), \ FILES := $(MSVCR_DLL), \
FLATTEN := true, \ FLATTEN := true, \
)) \ )) \
$(eval TARGETS += $$(COPY_GTEST_MSVCR_$v)) \ $(eval TARGETS += $$(COPY_GTEST_MSVCR_$v)) \
$(eval $(call SetupCopyFiles, COPY_GTEST_VCRUNTIME_1_$v, \
DEST := $(TEST_IMAGE_DIR)/hotspot/gtest/$v, \
FILES := $(VCRUNTIME_1_DLL), \
FLATTEN := true, \
)) \
$(eval TARGETS += $$(COPY_GTEST_VCRUNTIME_1_$v)) \
$(eval $(call SetupCopyFiles, COPY_GTEST_MSVCP_$v, \
DEST := $(TEST_IMAGE_DIR)/hotspot/gtest/$v, \
FILES := $(MSVCP_DLL), \
FLATTEN := true, \
)) \
$(eval TARGETS += $$(COPY_GTEST_MSVCP_$v)) \
$(if $(call equals, $(COPY_DEBUG_SYMBOLS), true), \ $(if $(call equals, $(COPY_DEBUG_SYMBOLS), true), \
$(eval $(call SetupCopyFiles, COPY_GTEST_PDB_$v, \ $(eval $(call SetupCopyFiles, COPY_GTEST_PDB_$v, \
SRC := $(HOTSPOT_OUTPUTDIR)/variant-$v/libjvm/gtest, \ SRC := $(HOTSPOT_OUTPUTDIR)/variant-$v/libjvm/gtest, \