Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7020815: REBASE should not be required for windows jdk repo builds - can't build with VS 2010 Express
authorohair
Wed, 02 Mar 2011 13:18:36 -0800
changeset 8458 0fcf0e3903ec
parent 8456 1ca6360372d5
child 8459 c5d9e61518cb
7020815: REBASE should not be required for windows jdk repo builds - can't build with VS 2010 Express Reviewed-by: prr
jdk/make/common/shared/Defs-utils.gmk file | annotate | diff | comparison | revisions
jdk/make/common/shared/Sanity.gmk file | annotate | diff | comparison | revisions 
--- a/jdk/make/common/shared/Defs-utils.gmk	Mon Feb 28 10:56:20 2011 +0100
+++ b/jdk/make/common/shared/Defs-utils.gmk	Wed Mar 02 13:18:36 2011 -0800
@@ -115,7 +115,6 @@
 PKGMK          = $(UTILS_COMMAND_PATH)pkgmk
 PRINTF         = $(UTILS_USR_BIN_PATH)printf
 PWD            = $(UTILS_COMMAND_PATH)pwd
-RC             = $(UTILS_COMMAND_PATH)rc
 READELF        = $(UTILS_USR_BIN_PATH)readelf
 RMDIR          = $(UTILS_COMMAND_PATH)rmdir
 RPM            = $(UTILS_COMMAND_PATH)rpm
--- a/jdk/make/common/shared/Sanity.gmk	Mon Feb 28 10:56:20 2011 +0100
+++ b/jdk/make/common/shared/Sanity.gmk	Wed Mar 02 13:18:36 2011 -0800
@@ -1012,11 +1012,6 @@
 	    "" >> $(ERROR_FILE) ; \
 	fi
   else
-    ifeq ($(wildcard $(REBASE)),)
-	@$(ECHO) "ERROR: Cannot find the REBASE utility from path: $(REBASE)\n" \
-	    "      This is normally obtained from the WINDOWSSDKDIR." \
-	    "" >> $(ERROR_FILE)
-    endif
     ifeq ($(wildcard $(RC)),)
 	@$(ECHO) "ERROR: Cannot find the RC utility from path: $(RC)\n" \
 	    "      This is normally obtained from the WINDOWSSDKDIR." \
@@ -1024,7 +1019,7 @@
     endif
     ifeq ($(wildcard $(DUMPBIN)),)
 	@$(ECHO) "ERROR: Cannot find the DUMPBIN utility from path: $(DUMPBIN)\n" \
-	    "      This is normally obtained from the WINDOWSSDKDIR." \
+	    "      This is normally obtained from the COMPILER_PATH." \
 	    "" >> $(ERROR_FILE)
     endif
   endif
jdk-sandbox