Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update JDK8 windows compiles to use Visual Studio 2013 #10892

Merged
merged 1 commit into from
Nov 4, 2020
Merged

Update JDK8 windows compiles to use Visual Studio 2013 #10892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions buildenv/jenkins/variables/defaults.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ x86-64_windows:
freemarker: '/cygdrive/c/openjdk/freemarker.jar'
extra_configure_options:
all: '--disable-ccache --with-cuda="C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v9.0"'
8: '--with-freetype-include=/cygdrive/c/openjdk/freetype-2.5.3/include --with-freetype-lib=/cygdrive/c/openjdk/freetype-2.5.3/lib64 --with-openssl=/cygdrive/c/openjdk/OpenSSL-1.1.1h-x86_64-VS2013'
8: '--with-toolchain-version=2013 --with-freetype-src=/cygdrive/c/openjdk/freetype-2.5.3 --with-openssl=/cygdrive/c/openjdk/OpenSSL-1.1.1h-x86_64-VS2013'
11: '--with-toolchain-version=2017 --with-openssl=/cygdrive/c/openjdk/OpenSSL-1.1.1h-x86_64-VS2017'
14: '--with-toolchain-version=2017 --with-openssl=/cygdrive/c/openjdk/OpenSSL-1.1.1h-x86_64-VS2017'
15: '--with-toolchain-version=2019 --with-openssl=/cygdrive/c/openjdk/OpenSSL-1.1.1h-x86_64-VS2019'
Expand Down Expand Up @@ -538,7 +538,7 @@ x86-32_windows:
release:
8: 'windows-x86-normal-server-release'
extra_configure_options:
8: '--with-freetype-include=/cygdrive/c/openjdk/freetype-2.5.3/include --with-freetype-lib=/cygdrive/c/openjdk/freetype-2.5.3/lib32 --with-target-bits=32 --disable-ccache --with-openssl=/cygdrive/c/openjdk/OpenSSL-1.1.1h-x86_32-VS2013'
8: '--with-toolchain-version=2013 --with-freetype-src=/cygdrive/c/openjdk/freetype-2.5.3 --with-target-bits=32 --disable-ccache --with-openssl=/cygdrive/c/openjdk/OpenSSL-1.1.1h-x86_32-VS2013'
freemarker: '/cygdrive/c/openjdk/freemarker.jar'
node_labels:
build:
Expand Down
2 changes: 1 addition & 1 deletion runtime/compiler/build/toolcfg/win-msvc/common.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ ifeq ($(origin MSVC_VERSION), undefined)
SOLINK_SLINK+=ucrt vcruntime
endif
else
ifneq (,$(filter 2015 2017 2019, $(MSVC_VERSION)))
ifneq (,$(filter 2013 2015 2017 2019, $(MSVC_VERSION)))
SOLINK_SLINK+=ucrt vcruntime
endif
endif
Expand Down