On Mon, 1 Feb 2021 12:16:09 GMT, Magnus Ihse Bursie <i...@openjdk.org> wrote:
>> Alexey Semenyuk has refreshed the contents of this pull request, and >> previous commits have been removed. The incremental views will show >> differences compared to the previous content of the PR. The pull request >> contains one new commit since the last revision: >> >> 8254702: jpackage app launcher crashes on CentOS > > make/modules/jdk.jpackage/Lib.gmk line 61: > >> 59: JPACKAGE_OUTPUT_DIR := >> $(JDK_OUTPUTDIR)/modules/$(MODULE)/jdk/jpackage/internal/resources >> 60: JPACKAGE_CXXFLAGS_windows := -EHsc -DUNICODE -D_UNICODE >> 61: JPACKAGE_CFLAGS_windows := -DUNICODE -D_UNICODE > > Why is this change modifying Windows? I thought it was supposed to be a > linux-only fix..? There is new shared JvmlLauncherLib.c file. This new make variable is to setup complier for this file on Windows. The functional change is Linux-only, however code base code reshuffled on all platforms. > make/modules/jdk.jpackage/Lib.gmk line 65: > >> 63: )) >> 64: >> 65: $(BUILD_JPACKAGE_APPLAUNCHEREXE): $(call FindLib, java.base, java) > > Why did you remove this dependency? I moved it to the bottom of the file making all artifacts produced by make/modules/jdk.jpackage/Lib.gmk depend on java.bas and java. There is `$(JPACKAGE_TARGETS): $(call FindLib, java.base, java)` at the bottom of the file. > make/modules/jdk.jpackage/Lib.gmk line 106: > >> 104: CFLAGS_linux := -Wno-format-nonliteral, \ >> 105: LDFLAGS := $(LDFLAGS_JDKLIB) \ >> 106: >> -Wl$(COMMA)--version-script=$(TOPDIR)/make/modules/$(MODULE)/applauncherlib.ld-version-script, >> \ > > We should really not be using linker scripts. I did not understand your > comment in the linker script -- was it only needed to handle your personal > build environment? If so, you need to fix your build environment instead. Yeh, I found that linker script is needed only in my local build env. I'll remove it then. ------------- PR: https://git.openjdk.java.net/jdk/pull/2320
