From f30a4a3d645b8c3d4754c2c3cb493ab9640da3c1 Mon Sep 17 00:00:00 2001 From: khanhduytran0 Date: Thu, 24 Sep 2020 09:07:19 +0700 Subject: [PATCH] Try to enable build awt --- buildjdk.sh | 2 +- override-jre-files/jdk/make/lib/Awt2dLibraries.gmk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildjdk.sh b/buildjdk.sh index 52e5ee8..63d83d0 100755 --- a/buildjdk.sh +++ b/buildjdk.sh @@ -18,8 +18,8 @@ cp -R -f override-jre-files/* openjdk/ cd openjdk rm -rf build -# --enable-headless-only \ bash ./configure \ + --enable-headless-only \ --enable-option-checking=fatal \ --openjdk-target=$TARGET \ --disable-warnings-as-errors \ diff --git a/override-jre-files/jdk/make/lib/Awt2dLibraries.gmk b/override-jre-files/jdk/make/lib/Awt2dLibraries.gmk index 248bedc..1acefd2 100644 --- a/override-jre-files/jdk/make/lib/Awt2dLibraries.gmk +++ b/override-jre-files/jdk/make/lib/Awt2dLibraries.gmk @@ -531,7 +531,7 @@ TARGETS += $(BUILD_LIBJAVAJPEG) ################################################################################ # Mac and Windows only use the native AWT lib, do not build libawt_headless -ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx),) +ifneq ($(findstring $(OPENJDK_TARGET_OS), windows macosx),) LIBAWT_HEADLESS_DIRS := $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt_headless/awt \ $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \