From 5542cf10a14f7d5bc95889088c3958024886918e Mon Sep 17 00:00:00 2001 From: Peter Shipton Date: Sat, 1 Feb 2025 11:48:45 -0500 Subject: [PATCH] Remove --without-cmake support Signed-off-by: Peter Shipton --- closed/CopyToBuildJdk.gmk | 9 +- closed/OpenJ9.gmk | 208 ++---------------- common/autoconf/generated-configure.sh | 2 +- jdk/make/closed/autoconf/custom-hook.m4 | 73 +----- jdk/make/closed/autoconf/custom-spec.gmk.in | 11 +- .../closed/autoconf/generated-configure.sh | 95 +------- 6 files changed, 24 insertions(+), 374 deletions(-) diff --git a/closed/CopyToBuildJdk.gmk b/closed/CopyToBuildJdk.gmk index feb4b7305c6..a727ff4976a 100644 --- a/closed/CopyToBuildJdk.gmk +++ b/closed/CopyToBuildJdk.gmk @@ -1,5 +1,5 @@ # =========================================================================== -# (c) Copyright IBM Corp. 2020, 2024 All Rights Reserved +# (c) Copyright IBM Corp. 2020, 2025 All Rights Reserved # =========================================================================== # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as @@ -216,12 +216,7 @@ ifeq (true,$(OPENJ9_ENABLE_DDR)) $(OPENJ9_VM_BUILD_DIR)/j9ddr.dat : run-ddrgen run-ddrgen : - ifeq (true,$(OPENJ9_ENABLE_CMAKE)) - $(EXPORT_MSVS_ENV_VARS) $(MAKE) -C $(OPENJ9_VM_BUILD_DIR) j9ddr - else # OPENJ9_ENABLE_CMAKE - CC="$(CC)" CXX="$(CXX)" VERSION_MAJOR=8 $(EXPORT_MSVS_ENV_VARS) \ - $(MAKE) -C $(OPENJ9_VM_BUILD_DIR)/ddr -f run_omrddrgen.mk - endif # OPENJ9_ENABLE_CMAKE + $(EXPORT_MSVS_ENV_VARS) $(MAKE) -C $(OPENJ9_VM_BUILD_DIR) j9ddr $(call openj9_copy_files,, \ $(addsuffix /j9ddr.dat, \ diff --git a/closed/OpenJ9.gmk b/closed/OpenJ9.gmk index 5da300b7a72..e6b6120209f 100644 --- a/closed/OpenJ9.gmk +++ b/closed/OpenJ9.gmk @@ -1,5 +1,5 @@ # =========================================================================== -# (c) Copyright IBM Corp. 2017, 2024 All Rights Reserved +# (c) Copyright IBM Corp. 2017, 2025 All Rights Reserved # =========================================================================== # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as @@ -97,34 +97,8 @@ endif generate-j9jcl-sources \ generate-j9-version-headers \ openj9-config-headers \ - run-preprocessors-j9 \ - stage-j9 \ # -# openj9_copy_tree -# ---------------- -# param 1 = The target directory to create or update. -# param 2 = The source directory to copy. -define openj9_copy_tree - $(call openj9_copy_tree_impl,$(strip $(abspath $1)),$(strip $(abspath $2))) -endef - -OPENJ9_MARKER_FILE := .up-to-date - -# Use '-m' to update file modification times ('-m' is equivalent to '--touch' in some implementations of tar). -define openj9_copy_tree_impl - @$(MKDIR) -p $1 - @$(TAR) --create --directory=$2 $(if $(wildcard $1/$(OPENJ9_MARKER_FILE)),--newer=$1/$(OPENJ9_MARKER_FILE)) --exclude=.git . \ - | $(TAR) --extract --directory=$1 -m - @$(TOUCH) $1/$(OPENJ9_MARKER_FILE) -endef - -ifeq (true,$(OPENJ9_ENABLE_CMAKE)) - CONFIG_HEADERS := j9cfg.h omr/omrcfg.h -else - CONFIG_HEADERS := include/j9cfg.h omr/include_core/omrcfg.h -endif - define openj9_config_header_rules openj9-config-headers : $(JDK_OUTPUTDIR)/openj9_include/$(notdir $1) @@ -133,119 +107,11 @@ define openj9_config_header_rules endef $(foreach file, \ - $(CONFIG_HEADERS), \ + j9cfg.h omr/omrcfg.h, \ $(eval $(call openj9_config_header_rules, $(OPENJ9_VM_BUILD_DIR)/$(file)))) -# Comments for stage-j9 -# Currently there is a staged location where j9 is built. This is due to a number of reasons: -# 1. make currently leaves output file in current directory -# 2. generated source and header files -# 3. repo layout compared to source.zip layout -# See issue 49 for more information and actions to correct this action. - -# Functions to generate sed program fragments. -# $1 - name of flag to be enabled or disabled. -SedDisable = -e '/"$(strip $1)"/s/"true"/"false"/g' -SedEnable = -e '/"$(strip $1)"/s/"false"/"true"/g' - -# Adjust features based on our configuration. -ifeq (true,$(OPENJ9_ENABLE_CUDA)) - FEATURE_SED_SCRIPT := $(call SedEnable,opt_cuda) -else - FEATURE_SED_SCRIPT := $(call SedDisable,opt_cuda) -endif - -# Function to generate sed program fragment. -# $1 - name of make macro to use instead of a hard-coded tool reference. -# $2 - suffix of uma_make_cmd property name to be adjusted. -SedUmaCommand = -e '/ $$@ - else ifeq (.spec,$(suffix $1)) - @$(SED) $(SPEC_SED_SCRIPT) < $$< > $$@ - else - @$(CP) $$< $$@ - endif -endef - -$(foreach file, \ - $(notdir $(wildcard $(OPENJ9_TOPDIR)/buildspecs/*)), \ - $(eval $(call openj9_stage_buildspec_file,$(file)))) - J9TOOLS_DIR := $(JDK_OUTPUTDIR)/j9tools -stage-j9 : - @$(ECHO) Staging OpenJ9 runtime in $(OPENJ9_VM_BUILD_DIR) - $(call openj9_copy_tree,$(OPENJ9_VM_BUILD_DIR),$(OPENJ9_TOPDIR)/runtime) - - @$(ECHO) Staging OpenJ9 OMR in $(OPENJ9_VM_BUILD_DIR) - $(call openj9_copy_tree,$(OPENJ9_VM_BUILD_DIR)/omr,$(OPENJ9OMR_TOPDIR)) - OPENJ9_VERSION_VARS := \ COMPANY_NAME \ COMPILER_VERSION_STRING \ @@ -312,7 +178,6 @@ generate-j9-version-headers : @$(GREP) define $(OPENJ9_VM_BUILD_DIR)/include/openj9_version_info.h @$(ECHO) "====" -ifeq (true,$(OPENJ9_ENABLE_CMAKE)) CMAKE_ARGS := \ -C $(OPENJ9_TOPDIR)/runtime/cmake/caches/$(patsubst %_cross,%,$(OPENJ9_BUILDSPEC)).cmake \ -DBOOT_JDK=$(BOOT_JDK) \ @@ -410,77 +275,30 @@ ifneq (,$(filter debug trace, $(LOG_LEVEL))) CMAKE_ARGS += -DCMAKE_VERBOSE_MAKEFILE=ON endif - # Propagate configure option '--disable-warnings-as-errors-omr' to OMR. - ifeq (false,$(WARNINGS_AS_ERRORS_OMR)) - CMAKE_ARGS += -DOMR_WARNINGS_AS_ERRORS=OFF - endif +# Propagate configure option '--disable-warnings-as-errors-omr' to OMR. +ifeq (false,$(WARNINGS_AS_ERRORS_OMR)) + CMAKE_ARGS += -DOMR_WARNINGS_AS_ERRORS=OFF +endif - # Propagate configure option '--disable-warnings-as-errors-openj9' to OpenJ9. - ifeq (false,$(WARNINGS_AS_ERRORS_OPENJ9)) - CMAKE_ARGS += -DJ9VM_WARNINGS_AS_ERRORS=OFF - endif +# Propagate configure option '--disable-warnings-as-errors-openj9' to OpenJ9. +ifeq (false,$(WARNINGS_AS_ERRORS_OPENJ9)) + CMAKE_ARGS += -DJ9VM_WARNINGS_AS_ERRORS=OFF +endif - # Do this last so extra args take precedence. - CMAKE_ARGS += $(EXTRA_CMAKE_ARGS) +# Do this last so extra args take precedence. +CMAKE_ARGS += $(EXTRA_CMAKE_ARGS) $(OUTPUT_ROOT)/vm/cmake.stamp : @$(MKDIR) -p $(@D) cd $(@D) && $(CMAKE) $(CMAKE_ARGS) $(OPENJ9_TOPDIR) $(TOUCH) $@ -run-preprocessors-j9 : $(OUTPUT_ROOT)/vm/cmake.stamp - -else # OPENJ9_ENABLE_CMAKE - -ifeq (true,$(OPENJ9_ENABLE_JITSERVER)) - CUSTOM_COMPILER_ENV_VARS += J9VM_OPT_JITSERVER=1 - - ifneq (,$(OPENSSL_CFLAGS)) - CUSTOM_COMPILER_ENV_VARS += OPENSSL_CFLAGS="$(OPENSSL_CFLAGS)" - endif - - ifneq (,$(OPENSSL_DIR)) - CUSTOM_COMPILER_ENV_VARS += OPENSSL_DIR="$(OPENSSL_DIR)" - endif - - ifneq (,$(OPENSSL_BUNDLE_LIB_PATH)) - CUSTOM_COMPILER_ENV_VARS += OPENSSL_BUNDLE_LIB_PATH="$(OPENSSL_BUNDLE_LIB_PATH)" - endif -endif # OPENJ9_ENABLE_JITSERVER - -run-preprocessors-j9 : stage-j9 - @$(ECHO) Running OpenJ9 preprocessors with OPENJ9_BUILDSPEC: $(OPENJ9_BUILDSPEC) - @$(MKDIR) -p $(J9TOOLS_DIR) - +OPENJDK_VERSION_NUMBER_FOUR_POSITIONS=$(VERSION_NUMBER_FOUR_POSITIONS) \ - $(MAKE) $(MAKE_ARGS) -C $(OUTPUT_ROOT)/vm -f $(OPENJ9_TOPDIR)/runtime/buildtools.mk \ - BOOT_JDK=$(BOOT_JDK) \ - BUILD_ID=$(BUILD_ID) \ - DEST_DIR=$(call FixPath,$(J9TOOLS_DIR)) \ - FREEMARKER_JAR="$(FREEMARKER_JAR)" \ - J9VM_SHA=$(OPENJ9_SHA) \ - JAVA_HOME=$(BOOT_JDK) \ - JAVA_VERSION=80 \ - OMR_DIR=$(OPENJ9_VM_BUILD_DIR)/omr \ - SOURCETOOLS_DIR=$(call FixPath,$(OPENJ9_TOPDIR))/sourcetools \ - SPEC=$(OPENJ9_BUILDSPEC) \ - UMA_OPTIONS_EXTRA="-buildDate $(shell date +'%Y%m%d')" \ - VERSION_MAJOR=8 \ - tools - -endif # OPENJ9_ENABLE_CMAKE - -run-preprocessors-j9 : generate-j9-version-headers generate-j9jcl-sources - -ifeq (true,$(OPENJ9_ENABLE_CMAKE)) # Both cmake and the makefiles it generates are sensitive to the VERBOSE # environment variable. This removes VERBOSE from the environment altogether # for build behavior that's consistent with newer jdk versions. MAKE_VM := unset VERBOSE && $(filter-out VERBOSE=%, $(MAKE)) -else - MAKE_VM := $(MAKE) -endif -build-j9vm : run-preprocessors-j9 +build-j9vm : $(OUTPUT_ROOT)/vm/cmake.stamp generate-j9-version-headers generate-j9jcl-sources @$(ECHO) "Compiling OpenJ9 in $(OUTPUT_ROOT)/vm" $(call ShowVersions) +export OPENJ9_BUILD=true $(CUSTOM_COMPILER_ENV_VARS) \ diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index ae25056e65a..7e0def57671 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -4455,7 +4455,7 @@ VS_TOOLSET_SUPPORTED_2022=true #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1730492081 +DATE_WHEN_GENERATED=1738614730 ############################################################################### # diff --git a/jdk/make/closed/autoconf/custom-hook.m4 b/jdk/make/closed/autoconf/custom-hook.m4 index 95b5d7afd13..310d21f9c55 100644 --- a/jdk/make/closed/autoconf/custom-hook.m4 +++ b/jdk/make/closed/autoconf/custom-hook.m4 @@ -1,5 +1,5 @@ # =========================================================================== -# (c) Copyright IBM Corp. 2017, 2024 All Rights Reserved +# (c) Copyright IBM Corp. 2017, 2025 All Rights Reserved # =========================================================================== # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as @@ -56,38 +56,12 @@ AC_DEFUN_ONCE([CUSTOM_EARLY_HOOK], TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV fi - OPENJ9_THIRD_PARTY_REQUIREMENTS OPENJ9_CHECK_NASM_VERSION ]) AC_DEFUN([OPENJ9_CONFIGURE_CMAKE], [ - AC_ARG_WITH(cmake, [AS_HELP_STRING([--with-cmake], [enable building openJ9 with CMake])], - [ - if test "x$with_cmake" = xyes -o "x$with_cmake" = x ; then - with_cmake=cmake - fi - ], - [ - with_cmake=cmake - ]) - # at this point with_cmake should either be no, or the name of the cmake command - if test "x$with_cmake" = xno ; then - OPENJ9_ENABLE_CMAKE=false - # Currently, mixedrefs mode is only available with CMake enabled - if test "x$OMR_MIXED_REFERENCES_MODE" != xoff ; then - AC_MSG_ERROR([[--with-mixedrefs=[static|dynamic] requires --with-cmake]]) - fi - else - OPENJ9_ENABLE_CMAKE=true - if AS_EXECUTABLE_P(["$with_cmake"]) ; then - CMAKE="$with_cmake" - else - BASIC_REQUIRE_PROGS([CMAKE], [$with_cmake]) - fi - fi - - AC_SUBST(OPENJ9_ENABLE_CMAKE) + BASIC_REQUIRE_PROGS(CMAKE, cmake) ]) AC_DEFUN([OPENJ9_CONFIGURE_COMPILERS], @@ -553,49 +527,6 @@ AC_DEFUN([OPENJDK_VERSION_DETAILS], AC_SUBST(USERNAME) ]) -AC_DEFUN([OPENJ9_THIRD_PARTY_REQUIREMENTS], -[ - # check 3rd party library requirement for UMA - AC_ARG_WITH(freemarker-jar, [AS_HELP_STRING([--with-freemarker-jar], - [path to freemarker.jar (used to build OpenJ9 build tools)])]) - - FREEMARKER_JAR= - if test "x$OPENJ9_ENABLE_CMAKE" != xtrue ; then - if test "x$with_freemarker_jar" = x -o "x$with_freemarker_jar" = xno ; then - printf "\n" - printf "The FreeMarker library is required to build the OpenJ9 build tools\n" - printf "and has to be provided during configure process.\n" - printf "\n" - printf "Download the FreeMarker library and unpack it into an arbitrary directory:\n" - printf "\n" - printf "wget https://sourceforge.net/projects/freemarker/files/freemarker/2.3.8/freemarker-2.3.8.tar.gz/download -O freemarker-2.3.8.tar.gz\n" - printf "\n" - printf "tar -xzf freemarker-2.3.8.tar.gz\n" - printf "\n" - printf "Then run configure with '--with-freemarker-jar='\n" - printf "\n" - - AC_MSG_ERROR([Cannot continue]) - fi - - AC_MSG_CHECKING([checking that '$with_freemarker_jar' exists]) - if test -f "$with_freemarker_jar" ; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - AC_MSG_ERROR([freemarker.jar not found at '$with_freemarker_jar']) - fi - - if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin ; then - FREEMARKER_JAR=`$CYGPATH -m "$with_freemarker_jar"` - else - FREEMARKER_JAR=$with_freemarker_jar - fi - fi - - AC_SUBST(FREEMARKER_JAR) -]) - AC_DEFUN_ONCE([CUSTOM_LATE_HOOK], [ # You're here because you want OpenJ9, not some other implementation. diff --git a/jdk/make/closed/autoconf/custom-spec.gmk.in b/jdk/make/closed/autoconf/custom-spec.gmk.in index 8f035259e92..1b1c175b6f1 100644 --- a/jdk/make/closed/autoconf/custom-spec.gmk.in +++ b/jdk/make/closed/autoconf/custom-spec.gmk.in @@ -1,5 +1,5 @@ # =========================================================================== -# (c) Copyright IBM Corp. 2017, 2024 All Rights Reserved +# (c) Copyright IBM Corp. 2017, 2025 All Rights Reserved # =========================================================================== # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as @@ -75,10 +75,7 @@ J9JDK_EXT_NAME := Extensions for OpenJDK for Eclipse OpenJ9 # required by CMake CMAKE := @CMAKE@ -OPENJ9_ENABLE_CMAKE := @OPENJ9_ENABLE_CMAKE@ -# required by UMA -FREEMARKER_JAR := @FREEMARKER_JAR@ OPENJ9_BUILDSPEC := @OPENJ9_BUILDSPEC@ # required by JPP @@ -130,11 +127,7 @@ else endif # Use '=' instead of ':=' because bootcycle-spec.gmk overrides OUTPUT_ROOT. -ifeq (true,$(OPENJ9_ENABLE_CMAKE)) - OPENJ9_VM_BUILD_DIR = $(OUTPUT_ROOT)/vm/runtime -else - OPENJ9_VM_BUILD_DIR = $(OUTPUT_ROOT)/vm -endif +OPENJ9_VM_BUILD_DIR = $(OUTPUT_ROOT)/vm/runtime # Enable use of j9cfg.h in openjdk native code. $(foreach var, \ diff --git a/jdk/make/closed/autoconf/generated-configure.sh b/jdk/make/closed/autoconf/generated-configure.sh index 9d0f59b71e0..720c6e6c502 100644 --- a/jdk/make/closed/autoconf/generated-configure.sh +++ b/jdk/make/closed/autoconf/generated-configure.sh @@ -892,7 +892,6 @@ CHECK_GMAKE PKGHANDLER DEVKIT_LIB_DIR NASM -FREEMARKER_JAR VS_LIB VS_INCLUDE VS_PATH @@ -917,7 +916,6 @@ OPENJ9_DEVELOPER_DIR OPENJ9_CXX OPENJ9_CC OPENJ9_CLANG -OPENJ9_ENABLE_CMAKE CMAKE USERNAME JDK_FIX_VERSION @@ -1094,7 +1092,6 @@ enable_debug with_debug_level with_noncompressedrefs with_mixedrefs -with_cmake with_openj9_cc with_openj9_cxx with_openj9_developer_dir @@ -1113,7 +1110,6 @@ enable_warnings_as_errors_omr enable_warnings_as_errors_openj9 with_conf_name with_toolchain_version -with_freemarker_jar with_devkit with_sys_root with_sysroot @@ -1976,7 +1972,6 @@ Optional Packages: build non-compressedrefs vm (large heap) --with-mixedrefs build mixedrefs vm (--with-mixedrefs=static or --with-mixedrefs=dynamic) - --with-cmake enable building openJ9 with CMake --with-openj9-cc build OpenJ9 with a specific C compiler --with-openj9-cxx build OpenJ9 with a specific C++ compiler --with-openj9-developer-dir @@ -1990,8 +1985,6 @@ Optional Packages: the version of the toolchain to look for, use '--help' to show possible values [platform dependent] - --with-freemarker-jar path to freemarker.jar (used to build OpenJ9 build - tools) --with-devkit use this devkit for compilers, tools and resources --with-sys-root alias for --with-sysroot for backwards compatability --with-sysroot use this directory as sysroot) @@ -4563,7 +4556,7 @@ VS_TOOLSET_SUPPORTED_2022=true # definitions. It is replaced with custom functionality when building # custom sources. # =========================================================================== -# (c) Copyright IBM Corp. 2017, 2024 All Rights Reserved +# (c) Copyright IBM Corp. 2017, 2025 All Rights Reserved # =========================================================================== # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as @@ -4619,8 +4612,6 @@ VS_TOOLSET_SUPPORTED_2022=true - - @@ -4634,7 +4625,7 @@ VS_TOOLSET_SUPPORTED_2022=true # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1730492081 +DATE_WHEN_GENERATED=1738614730 ############################################################################### # @@ -15608,32 +15599,6 @@ fi -# Check whether --with-cmake was given. -if test "${with_cmake+set}" = set; then : - withval=$with_cmake; - if test "x$with_cmake" = xyes -o "x$with_cmake" = x ; then - with_cmake=cmake - fi - -else - - with_cmake=cmake - -fi - - # at this point with_cmake should either be no, or the name of the cmake command - if test "x$with_cmake" = xno ; then - OPENJ9_ENABLE_CMAKE=false - # Currently, mixedrefs mode is only available with CMake enabled - if test "x$OMR_MIXED_REFERENCES_MODE" != xoff ; then - as_fn_error $? "--with-mixedrefs=[static|dynamic] requires --with-cmake" "$LINENO" 5 - fi - else - OPENJ9_ENABLE_CMAKE=true - if as_fn_executable_p "$with_cmake" ; then - CMAKE="$with_cmake" - else - # Publish this variable in the help. @@ -15641,7 +15606,7 @@ fi if test "x$CMAKE" = x; then # The variable is not set by user, try to locate tool using the code snippet - for ac_prog in $with_cmake + for ac_prog in cmake do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -15699,7 +15664,7 @@ done $as_echo "$as_me: WARNING: Ignoring value of CMAKE from the environment. Use command line variables instead." >&2;} fi # Try to locate tool using the code snippet - for ac_prog in $with_cmake + for ac_prog in cmake do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -15826,10 +15791,6 @@ $as_echo "$tool_specified" >&6; } fi - fi - fi - - @@ -18038,54 +17999,6 @@ $as_echo "$as_me: or run \"bash.exe -l\" from a VS command prompt and then run c fi - # check 3rd party library requirement for UMA - -# Check whether --with-freemarker-jar was given. -if test "${with_freemarker_jar+set}" = set; then : - withval=$with_freemarker_jar; -fi - - - FREEMARKER_JAR= - if test "x$OPENJ9_ENABLE_CMAKE" != xtrue ; then - if test "x$with_freemarker_jar" = x -o "x$with_freemarker_jar" = xno ; then - printf "\n" - printf "The FreeMarker library is required to build the OpenJ9 build tools\n" - printf "and has to be provided during configure process.\n" - printf "\n" - printf "Download the FreeMarker library and unpack it into an arbitrary directory:\n" - printf "\n" - printf "wget https://sourceforge.net/projects/freemarker/files/freemarker/2.3.8/freemarker-2.3.8.tar.gz/download -O freemarker-2.3.8.tar.gz\n" - printf "\n" - printf "tar -xzf freemarker-2.3.8.tar.gz\n" - printf "\n" - printf "Then run configure with '--with-freemarker-jar='\n" - printf "\n" - - as_fn_error $? "Cannot continue" "$LINENO" 5 - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking checking that '$with_freemarker_jar' exists" >&5 -$as_echo_n "checking checking that '$with_freemarker_jar' exists... " >&6; } - if test -f "$with_freemarker_jar" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - as_fn_error $? "freemarker.jar not found at '$with_freemarker_jar'" "$LINENO" 5 - fi - - if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin ; then - FREEMARKER_JAR=`$CYGPATH -m "$with_freemarker_jar"` - else - FREEMARKER_JAR=$with_freemarker_jar - fi - fi - - - - # Convert openjdk cpu names to openj9 names case "$host_cpu" in