OpenJDK / jdk / jdk
changeset 54548:b057e09eef80
8222510: Small cleanup for JDK launcher's make file
Reviewed-by: clanger, erikj
| author | manc |
|---|---|
| date | Mon, 15 Apr 2019 18:37:18 -0700 |
| parents | 53aecb049e0a |
| children | 02ef86858896 |
| files | make/launcher/Launcher-java.base.gmk make/launcher/LauncherCommon.gmk |
| diffstat | 2 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/make/launcher/Launcher-java.base.gmk Tue Apr 16 18:22:13 2019 +0200 +++ b/make/launcher/Launcher-java.base.gmk Mon Apr 15 18:37:18 2019 -0700 @@ -39,7 +39,6 @@ # overwritten. $(eval $(call SetupBuildLauncher, java, \ CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES, \ - LDFLAGS_solaris := -R$(OPENWIN_HOME)/lib$(OPENJDK_TARGET_CPU_ISADIR), \ EXTRA_RC_FLAGS := $(JAVA_RC_FLAGS), \ VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \ OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/java_objs, \
--- a/make/launcher/LauncherCommon.gmk Tue Apr 16 18:22:13 2019 +0200 +++ b/make/launcher/LauncherCommon.gmk Mon Apr 15 18:37:18 2019 -0700 @@ -73,8 +73,7 @@ # compile time defines exceeding Visual Studio 2013 limitations. # CFLAGS Additional CFLAGS # CFLAGS_windows Additional CFLAGS_windows -# LDFLAGS_solaris Additional LDFLAGS_solaris -# RC_FLAGS Additional RC_FLAGS +# EXTRA_RC_FLAGS Additional EXTRA_RC_FLAGS # MACOSX_SIGNED On macosx, sign this binary # OPTIMIZATION Override default optimization level (LOW) # OUTPUT_DIR Override default output directory @@ -139,7 +138,7 @@ NAME := $1, \ EXTRA_FILES := $(LAUNCHER_SRC)/main.c, \ OPTIMIZATION := $$($1_OPTIMIZATION), \ - CFLAGS := $$(CFLAGS_JDKEXE) $$($1_CFLAGS) \ + CFLAGS := $$(CFLAGS_JDKEXE) \ $(LAUNCHER_CFLAGS) \ $(VERSION_CFLAGS) \ -DLAUNCHER_NAME='"$(LAUNCHER_NAME)"' \