--- a/jdk/make/common/shared/Sanity.gmk Tue Mar 15 13:15:31 2011 +0000
+++ b/jdk/make/common/shared/Sanity.gmk Tue Mar 15 19:52:42 2011 -0400
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -220,7 +220,7 @@
sane-ant_version \
sane-zip_version \
sane-unzip_version \
- sane-msvcrt_path \
+ sane-msvcrt_path \
sane-freetype \
sane-build_modules
@@ -280,6 +280,12 @@
" $(YOU_ARE_USING) ARCH_DATA_MODEL=$(ARCH_DATA_MODEL). \n" \
"" >> $(ERROR_FILE) ; \
fi
+ifdef BUILD_CLIENT_ONLY
+ @if [ "$(ARCH_DATA_MODEL)" != 32 ]; then \
+ $(ECHO) "WARNING: You have requested BUILD_CLIENT_ONLY in a 64-bit build.\n" \
+ "" >> $(WARNING_FILE) ; \
+ fi
+endif
######################################################
# Check the OS version (windows and linux have release name checks)
@@ -1327,7 +1333,7 @@
" Microsoft DirectX 9 SDK can be downloaded from the following location:\n" \
" http://msdn.microsoft.com/library/default.asp?url=/downloads/list/directx.asp\n" \
" Or http://www.microsoft.com/directx\n" \
- "" >> $(WARNING_FILE) ; \
+ "" >> $(WARNING_FILE) ; \
fi \
fi \
fi \