diff --git a/make/jdk-rules.gmk b/make/jdk-rules.gmk index 821f5d739c630c7220d8cc42c57fbc0876f2825c..d0ca905ff02f7758dcdf2ed78511cfca71e2ff9a 100644 --- a/make/jdk-rules.gmk +++ b/make/jdk-rules.gmk @@ -106,7 +106,7 @@ jdk-clobber:: $(MAKE) $(JDK_CLOBBER_TARGETS) $(JDK_BUILD_ARGUMENTS) ; ) jdk-sanity:: - @( $(CD) $(JDK_TOPDIR)/make && \ + ( $(CD) $(JDK_TOPDIR)/make && \ $(MAKE) sanity HOTSPOT_IMPORT_CHECK=false $(JDK_BUILD_ARGUMENTS) ; ) compare-images: compare-image diff --git a/make/jprt.config b/make/jprt.config index f3ff50615ef46294efedea89db46eb1c178ab946..895d9432e016092094e096d54e7caa7fd5eae6b2 100644 --- a/make/jprt.config +++ b/make/jprt.config @@ -358,6 +358,13 @@ else ALT_SPONSOR2DIR=C:/sponsor_binaries export ALT_SPONSOR2DIR + # JPRT systems can never run msival2.exe, set this to avoid them + SKIP_MSIVAL2=true + export SKIP_MSIVAL2 + # Not easy to do + SKIP_COMPARE_IMAGES=true + export SKIP_COMPARE_IMAGES + fi # Export PATH setting diff --git a/make/jprt.gmk b/make/jprt.gmk index fcf67f80b36fd53593998f0238eab0a2aab81ef1..32803e06256461ecee898257a46b7d5c2f07e94d 100644 --- a/make/jprt.gmk +++ b/make/jprt.gmk @@ -36,7 +36,7 @@ DEFAULT_BUILD_FLAVOR=product JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-bundle.zip JPRT_ARCHIVE_INSTALL_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-install-bundle.zip -jprt_build_product: all_product_build +jprt_build_product: sanity all_product_build ( $(CD) $(OUTPUTDIR)/j2sdk-image && \ $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . ) ifdef HAVE_JPRT_SAVE_BUNDLES