force native comp

joe-braley · Oct 17, 2023 · 9e62946 · 9e62946
1 parent b22dd9a
commit 9e62946
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/make/autoconf/platform.m4 b/make/autoconf/platform.m4
@@ -373,12 +373,12 @@ AC_DEFUN([PLATFORM_SETUP_TARGET_CPU_BITS],
   # cross   == traditional cross compilation, target system != build system; special toolchain needed
   # reduced == using native compilers, but with special flags (e.g. -m32) to produce 32-bit builds on 64-bit machines
   #
-  if test "x$OPENJDK_BUILD_AUTOCONF_NAME" != "x$OPENJDK_TARGET_AUTOCONF_NAME"; then
-    # We're doing a proper cross-compilation
-    COMPILE_TYPE="cross"
-  else
-    COMPILE_TYPE="native"
-  fi
+#   if test "x$OPENJDK_BUILD_AUTOCONF_NAME" != "x$OPENJDK_TARGET_AUTOCONF_NAME"; then
+#    # We're doing a proper cross-compilation
+#    COMPILE_TYPE="cross"
+#  else
+  COMPILE_TYPE="native"
+#  fi
 
   if test "x$with_target_bits" != x; then
     if test "x$COMPILE_TYPE" = "xcross"; then

diff --git a/make/gensrc/GensrcCLDR.gmk b/make/gensrc/GensrcCLDR.gmk
@@ -40,7 +40,9 @@ TZDATA_DIR := $(TOPDIR)/make/data/tzdata
 # tzmappings generation for Windows.
 # Since the rule is shared with CLDR_BASEMETAINFO_FILE target, note that
 # just removing the target tzmappings will not recreate the tzmappings file.
+$(call LogInfo, GENSRC_DIR IS: $(GENSRC_DIR))
 $(call LogInfo, OpenJDK target OS is: $(OPENJDK_TARGET_OS))
+$(call LogInfo, ATTEMPTING TO CREATE TZDATA NOW)
 ifeq ($(OPENJDK_TARGET_OS), windows)
   CLDR_WINTZMAPPINGS := $(GENSRC_BASEDIR)/windows/conf/tzmappings
   $(CLDR_WINTZMAPPINGS): $(CLDR_BASEMETAINFO_FILE)
@@ -68,5 +70,6 @@ $(CLDR_METAINFO_FILE): $(wildcard $(CLDRSRCDIR)/dtd/*.dtd) \
 	    -baselocales $(CLDR_BASE_LOCALES) \
 	    -o $(GENSRC_DIR)
 
+$(call LogInfo, CLDR_WINTZMAPPINGS IS SET TO $(CLDR_WINTZMAPPINGS))
 GENSRC_JAVA_BASE += $(CLDR_BASEMETAINFO_FILE) $(CLDR_WINTZMAPPINGS)
 GENSRC_JDK_LOCALEDATA += $(CLDR_METAINFO_FILE)