$OpenBSD: patch-jdk_make_common_shared_Sanity_gmk,v 1.1 2013/02/01 15:34:35 kurt Exp $
--- jdk/make/common/shared/Sanity.gmk.orig	Mon Jan 28 17:27:38 2013
+++ jdk/make/common/shared/Sanity.gmk	Mon Jan 28 17:34:31 2013
@@ -106,7 +106,7 @@ UNZIP_VER  :=$(call GetVersion,"$(_UNZIP_VER)")
 BOOT_VER   :=$(call GetVersion,"$(_BOOT_VER)")
 
 REQUIRED_ANT_VER      := 1.6.3
-_ANT_VER              :=$(shell $(ANT) -version 2>&1 )
+_ANT_VER              :=$(shell JAVA_HOME=$(BOOTDIR) $(ANT) -version 2>&1 )
 ANT_VER               :=$(call GetVersion,"$(_ANT_VER)")
 
 ifdef ALT_BINDIR
@@ -479,7 +479,7 @@ sane-variant:
 # LD_LIBRARY_PATH should not be set, unless you are insane.
 ######################################################
 sane-ld_library_path:
-ifdef LD_LIBRARY_PATH
+ifdef LD_LIBRARY_PATH_DISABLED
 	@$(ECHO) "ERROR: Your LD_LIBRARY_PATH environment variable is set.  This may \n" \
 	   "      produce binaries binaries incorrectly.  Please unset it \n" \
 	   "      and start your build again. \n" \
