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

8222510: Small cleanup for JDK launcher's make file

Browse Source 
Reviewed-by: clanger, erikj
This commit is contained in:
Man Cao 2019-04-15 18:37:18 -07:00
parent aba3b206cc
commit 440520aab0
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
make/launcher/Launcher-java.base.gmk
View File

@ -39,7 +39,6 @@ JAVA_RC_FLAGS += -I$(TOPDIR)/src/java.base/windows/native/launcher/icons
# overwritten. # overwritten.
$(eval $(call SetupBuildLauncher, java, \ $(eval $(call SetupBuildLauncher, java, \
CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES, \ CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES, \
LDFLAGS_solaris := -R$(OPENWIN_HOME)/lib$(OPENJDK_TARGET_CPU_ISADIR), \
EXTRA_RC_FLAGS := $(JAVA_RC_FLAGS), \ EXTRA_RC_FLAGS := $(JAVA_RC_FLAGS), \
VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \ VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \
OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/java_objs, \ OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/java_objs, \

5
make/launcher/LauncherCommon.gmk
View File

@ -73,8 +73,7 @@ JAVA_MANIFEST := $(TOPDIR)/src/java.base/windows/native/launcher/java.manifest
# compile time defines exceeding Visual Studio 2013 limitations. # compile time defines exceeding Visual Studio 2013 limitations.
# CFLAGS Additional CFLAGS # CFLAGS Additional CFLAGS
# CFLAGS_windows Additional CFLAGS_windows # CFLAGS_windows Additional CFLAGS_windows
# LDFLAGS_solaris Additional LDFLAGS_solaris # EXTRA_RC_FLAGS Additional EXTRA_RC_FLAGS
# RC_FLAGS Additional RC_FLAGS
# MACOSX_SIGNED On macosx, sign this binary # MACOSX_SIGNED On macosx, sign this binary
# OPTIMIZATION Override default optimization level (LOW) # OPTIMIZATION Override default optimization level (LOW)
# OUTPUT_DIR Override default output directory # OUTPUT_DIR Override default output directory
@ -139,7 +138,7 @@ define SetupBuildLauncherBody
NAME := $1, \ NAME := $1, \
EXTRA_FILES := $(LAUNCHER_SRC)/main.c, \ EXTRA_FILES := $(LAUNCHER_SRC)/main.c, \
OPTIMIZATION := $$($1_OPTIMIZATION), \ OPTIMIZATION := $$($1_OPTIMIZATION), \
CFLAGS := $$(CFLAGS_JDKEXE) $$($1_CFLAGS) \ CFLAGS := $$(CFLAGS_JDKEXE) \
$(LAUNCHER_CFLAGS) \ $(LAUNCHER_CFLAGS) \
$(VERSION_CFLAGS) \ $(VERSION_CFLAGS) \
-DLAUNCHER_NAME='"$(LAUNCHER_NAME)"' \ -DLAUNCHER_NAME='"$(LAUNCHER_NAME)"' \