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

8320767: Use := wherever possible in spec.gmk.in

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Magnus Ihse Bursie 2023-11-28 17:33:23 +00:00
parent 69c0b24386
commit adad132028
1 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
make/autoconf/spec.gmk.in
View File

@ -193,9 +193,9 @@ JDK_RC_PLATFORM_NAME := @JDK_RC_PLATFORM_NAME@
JDK_RC_NAME := @JDK_RC_NAME@ JDK_RC_NAME := @JDK_RC_NAME@
COMPANY_NAME := @COMPANY_NAME@ COMPANY_NAME := @COMPANY_NAME@
HOTSPOT_VM_DISTRO := @HOTSPOT_VM_DISTRO@ HOTSPOT_VM_DISTRO := @HOTSPOT_VM_DISTRO@
MACOSX_BUNDLE_NAME_BASE = @MACOSX_BUNDLE_NAME_BASE@ MACOSX_BUNDLE_NAME_BASE := @MACOSX_BUNDLE_NAME_BASE@
MACOSX_BUNDLE_ID_BASE = @MACOSX_BUNDLE_ID_BASE@ MACOSX_BUNDLE_ID_BASE := @MACOSX_BUNDLE_ID_BASE@
MACOSX_BUNDLE_BUILD_VERSION = @MACOSX_BUNDLE_BUILD_VERSION@ MACOSX_BUNDLE_BUILD_VERSION := @MACOSX_BUNDLE_BUILD_VERSION@
USERNAME := @USERNAME@ USERNAME := @USERNAME@
VENDOR_URL := @VENDOR_URL@ VENDOR_URL := @VENDOR_URL@
VENDOR_URL_BUG := @VENDOR_URL_BUG@ VENDOR_URL_BUG := @VENDOR_URL_BUG@
@ -439,18 +439,18 @@ JMH_VERSION := @JMH_VERSION@
GTEST_FRAMEWORK_SRC := @GTEST_FRAMEWORK_SRC@ GTEST_FRAMEWORK_SRC := @GTEST_FRAMEWORK_SRC@
# Source file for cacerts # Source file for cacerts
CACERTS_FILE = @CACERTS_FILE@ CACERTS_FILE := @CACERTS_FILE@
# Source folder for user provided cacerts PEM files # Source folder for user provided cacerts PEM files
CACERTS_SRC = @CACERTS_SRC@ CACERTS_SRC := @CACERTS_SRC@
# Enable unlimited crypto policy # Enable unlimited crypto policy
UNLIMITED_CRYPTO = @UNLIMITED_CRYPTO@ UNLIMITED_CRYPTO := @UNLIMITED_CRYPTO@
GCOV_ENABLED = @GCOV_ENABLED@ GCOV_ENABLED := @GCOV_ENABLED@
JCOV_ENABLED = @JCOV_ENABLED@ JCOV_ENABLED := @JCOV_ENABLED@
JCOV_HOME = @JCOV_HOME@ JCOV_HOME := @JCOV_HOME@
JCOV_INPUT_JDK = @JCOV_INPUT_JDK@ JCOV_INPUT_JDK := @JCOV_INPUT_JDK@
JCOV_FILTERS = @JCOV_FILTERS@ JCOV_FILTERS := @JCOV_FILTERS@
# AddressSanitizer # AddressSanitizer
ASAN_ENABLED := @ASAN_ENABLED@ ASAN_ENABLED := @ASAN_ENABLED@
@ -468,13 +468,13 @@ X_CFLAGS := @X_CFLAGS@
X_LIBS := @X_LIBS@ X_LIBS := @X_LIBS@
# The lowest required version of macosx # The lowest required version of macosx
MACOSX_VERSION_MIN = @MACOSX_VERSION_MIN@ MACOSX_VERSION_MIN := @MACOSX_VERSION_MIN@
# The highest allowed version of macosx # The highest allowed version of macosx
MACOSX_VERSION_MAX = @MACOSX_VERSION_MAX@ MACOSX_VERSION_MAX := @MACOSX_VERSION_MAX@
# The macosx code signing configuration # The macosx code signing configuration
MACOSX_CODESIGN_MODE := @MACOSX_CODESIGN_MODE@ MACOSX_CODESIGN_MODE := @MACOSX_CODESIGN_MODE@
MACOSX_CODESIGN_IDENTITY = @MACOSX_CODESIGN_IDENTITY@ MACOSX_CODESIGN_IDENTITY := @MACOSX_CODESIGN_IDENTITY@
# Toolchain type: gcc, clang, xlc, microsoft... # Toolchain type: gcc, clang, xlc, microsoft...
TOOLCHAIN_TYPE := @TOOLCHAIN_TYPE@ TOOLCHAIN_TYPE := @TOOLCHAIN_TYPE@
@ -487,7 +487,7 @@ HOTSPOT_TOOLCHAIN_TYPE := @HOTSPOT_TOOLCHAIN_TYPE@
# Option used to tell the compiler whether to create 32- or 64-bit executables # Option used to tell the compiler whether to create 32- or 64-bit executables
COMPILER_TARGET_BITS_FLAG := @COMPILER_TARGET_BITS_FLAG@ COMPILER_TARGET_BITS_FLAG := @COMPILER_TARGET_BITS_FLAG@
COMPILER_SUPPORTS_TARGET_BITS_FLAG = @COMPILER_SUPPORTS_TARGET_BITS_FLAG@ COMPILER_SUPPORTS_TARGET_BITS_FLAG := @COMPILER_SUPPORTS_TARGET_BITS_FLAG@
# Option used to pass a command file to the compiler # Option used to pass a command file to the compiler
COMPILER_COMMAND_FILE_FLAG := @COMPILER_COMMAND_FILE_FLAG@ COMPILER_COMMAND_FILE_FLAG := @COMPILER_COMMAND_FILE_FLAG@
@ -526,8 +526,8 @@ DISABLED_WARNINGS_CXX := @DISABLED_WARNINGS_CXX@
WARNINGS_AS_ERRORS := @WARNINGS_AS_ERRORS@ WARNINGS_AS_ERRORS := @WARNINGS_AS_ERRORS@
CFLAGS_CCACHE := @CFLAGS_CCACHE@ CFLAGS_CCACHE := @CFLAGS_CCACHE@
ADLC_LANGSTD_CXXFLAGS = @ADLC_LANGSTD_CXXFLAGS@ ADLC_LANGSTD_CXXFLAGS := @ADLC_LANGSTD_CXXFLAGS@
ADLC_LDFLAGS = @ADLC_LDFLAGS@ ADLC_LDFLAGS := @ADLC_LDFLAGS@
# Tools that potentially need to be cross compilation aware. # Tools that potentially need to be cross compilation aware.
CC := @CCACHE@ @ICECC@ @CC@ CC := @CCACHE@ @ICECC@ @CC@
@ -551,10 +551,10 @@ BASIC_ASFLAGS := @BASIC_ASFLAGS@
MACHINE_FLAG := @MACHINE_FLAG@ MACHINE_FLAG := @MACHINE_FLAG@
# These flags might contain variables set by a custom extension that is included later. # These flags might contain variables set by a custom extension that is included later.
EXTRA_CFLAGS = @EXTRA_CFLAGS@ EXTRA_CFLAGS := @EXTRA_CFLAGS@
EXTRA_CXXFLAGS = @EXTRA_CXXFLAGS@ EXTRA_CXXFLAGS := @EXTRA_CXXFLAGS@
EXTRA_LDFLAGS = @EXTRA_LDFLAGS@ EXTRA_LDFLAGS := @EXTRA_LDFLAGS@
EXTRA_ASFLAGS = @EXTRA_ASFLAGS@ EXTRA_ASFLAGS := @EXTRA_ASFLAGS@
CXX := @CCACHE@ @ICECC@ @CXX@ CXX := @CCACHE@ @ICECC@ @CXX@
@ -633,13 +633,13 @@ ASFLAGS_DEBUG_SYMBOLS := @ASFLAGS_DEBUG_SYMBOLS@
# #
# Compress (or not) jars # Compress (or not) jars
COMPRESS_JARS = @COMPRESS_JARS@ COMPRESS_JARS := @COMPRESS_JARS@
# Options to linker to specify the library name. # Options to linker to specify the library name.
# (Note absence of := assignment, because we do not want to evaluate the macro body here) # (Note absence of := assignment, because we do not want to evaluate the macro body here)
SET_SHARED_LIBRARY_NAME = @SET_SHARED_LIBRARY_NAME@ SET_SHARED_LIBRARY_NAME = @SET_SHARED_LIBRARY_NAME@
SHARED_LIBRARY_FLAGS = @SHARED_LIBRARY_FLAGS@ SHARED_LIBRARY_FLAGS := @SHARED_LIBRARY_FLAGS@
# Set origin using the linker, ie use the relative path to the dependent library to find the dependencies. # Set origin using the linker, ie use the relative path to the dependent library to find the dependencies.
# (Note absence of := assignment, because we do not want to evaluate the macro body here) # (Note absence of := assignment, because we do not want to evaluate the macro body here)
@ -647,11 +647,12 @@ SET_SHARED_LIBRARY_ORIGIN = @SET_SHARED_LIBRARY_ORIGIN@
SET_EXECUTABLE_ORIGIN = @SET_EXECUTABLE_ORIGIN@ SET_EXECUTABLE_ORIGIN = @SET_EXECUTABLE_ORIGIN@
# Different OS:es have different ways of naming shared libraries. # Different OS:es have different ways of naming shared libraries.
# The SHARED_LIBRARY macro takes "verify" as and argument and returns: # The SHARED_LIBRARY and STATIC_LIBRARY macros takes "verify" as and argument and returns:
# "libverify.so" or "libverify.dylib" or "verify.dll" depending on platform. # "libverify.so" or "libverify.dylib" or "verify.dll" depending on platform.
# (Note absence of := assignment, because we do not want to evaluate the macro body here) # (Note absence of := assignment, because we do not want to evaluate the macro body here)
SHARED_LIBRARY = @SHARED_LIBRARY@ SHARED_LIBRARY = @SHARED_LIBRARY@
STATIC_LIBRARY = @STATIC_LIBRARY@ STATIC_LIBRARY = @STATIC_LIBRARY@
LIBRARY_PREFIX := @LIBRARY_PREFIX@ LIBRARY_PREFIX := @LIBRARY_PREFIX@
SHARED_LIBRARY_SUFFIX := @SHARED_LIBRARY_SUFFIX@ SHARED_LIBRARY_SUFFIX := @SHARED_LIBRARY_SUFFIX@
STATIC_LIBRARY_SUFFIX := @STATIC_LIBRARY_SUFFIX@ STATIC_LIBRARY_SUFFIX := @STATIC_LIBRARY_SUFFIX@
@ -719,8 +720,8 @@ INTERIM_LANGTOOLS_ARGS := \
--patch-module java.base=$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim \ --patch-module java.base=$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim \
$(INTERIM_LANGTOOLS_ADD_EXPORTS) \ $(INTERIM_LANGTOOLS_ADD_EXPORTS) \
# #
JAVAC_MAIN_CLASS = -m jdk.compiler.interim/com.sun.tools.javac.Main JAVAC_MAIN_CLASS := -m jdk.compiler.interim/com.sun.tools.javac.Main
JAVADOC_MAIN_CLASS = -m jdk.javadoc.interim/jdk.javadoc.internal.tool.Main JAVADOC_MAIN_CLASS := -m jdk.javadoc.interim/jdk.javadoc.internal.tool.Main
# You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ... # You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ...
# Use = assignment to be able to override in bootcycle-spec.gmk # Use = assignment to be able to override in bootcycle-spec.gmk
@ -845,9 +846,9 @@ PNG_CFLAGS := @PNG_CFLAGS@
# Misc # Misc
# #
INCLUDE_SA = @INCLUDE_SA@ INCLUDE_SA := @INCLUDE_SA@
INCLUDE_JVMCI = @INCLUDE_JVMCI@ INCLUDE_JVMCI := @INCLUDE_JVMCI@
INCLUDE_COMPILER2 = @INCLUDE_COMPILER2@ INCLUDE_COMPILER2 := @INCLUDE_COMPILER2@
OS_VERSION_MAJOR := @OS_VERSION_MAJOR@ OS_VERSION_MAJOR := @OS_VERSION_MAJOR@
OS_VERSION_MINOR := @OS_VERSION_MINOR@ OS_VERSION_MINOR := @OS_VERSION_MINOR@
@ -898,10 +899,10 @@ GRAAL_BUILDER_IMAGE_SUBDIR := graal-builder-jdk
GRAAL_BUILDER_IMAGE_DIR := $(IMAGES_OUTPUTDIR)/$(GRAAL_BUILDER_IMAGE_SUBDIR) GRAAL_BUILDER_IMAGE_DIR := $(IMAGES_OUTPUTDIR)/$(GRAAL_BUILDER_IMAGE_SUBDIR)
# Macosx bundles directory definitions # Macosx bundles directory definitions
JDK_MACOSX_BUNDLE_SUBDIR = jdk-bundle JDK_MACOSX_BUNDLE_SUBDIR := jdk-bundle
JRE_MACOSX_BUNDLE_SUBDIR = jre-bundle JRE_MACOSX_BUNDLE_SUBDIR := jre-bundle
JDK_MACOSX_BUNDLE_SUBDIR_SIGNED = jdk-bundle-signed JDK_MACOSX_BUNDLE_SUBDIR_SIGNED := jdk-bundle-signed
JRE_MACOSX_BUNDLE_SUBDIR_SIGNED = jre-bundle-signed JRE_MACOSX_BUNDLE_SUBDIR_SIGNED := jre-bundle-signed
JDK_MACOSX_BUNDLE_DIR = $(IMAGES_OUTPUTDIR)/$(JDK_MACOSX_BUNDLE_SUBDIR) JDK_MACOSX_BUNDLE_DIR = $(IMAGES_OUTPUTDIR)/$(JDK_MACOSX_BUNDLE_SUBDIR)
JRE_MACOSX_BUNDLE_DIR = $(IMAGES_OUTPUTDIR)/$(JRE_MACOSX_BUNDLE_SUBDIR) JRE_MACOSX_BUNDLE_DIR = $(IMAGES_OUTPUTDIR)/$(JRE_MACOSX_BUNDLE_SUBDIR)
JDK_MACOSX_BUNDLE_DIR_SIGNED = $(IMAGES_OUTPUTDIR)/$(JDK_MACOSX_BUNDLE_SUBDIR_SIGNED) JDK_MACOSX_BUNDLE_DIR_SIGNED = $(IMAGES_OUTPUTDIR)/$(JDK_MACOSX_BUNDLE_SUBDIR_SIGNED)