6962540: langtools Makefile sets DEV_NULL incorrectly
authorjjg
Fri Jun 18 16:45:13 2010 -0700 (2 years ago)
changeset 990e4ccb5a0d40
parent 987d51140c7453
child 102e7e6982abb38
6962540: langtools Makefile sets DEV_NULL incorrectly
Reviewed-by: ohair
make/Makefile
--- a/make/Makefile Fri Jun 18 11:13:26 2010 -0700
+++ b/make/Makefile Fri Jun 18 16:45:13 2010 -0700
@@ -40,15 +40,16 @@ SUN_MAKE_TEST:sh = @echo "ERROR: PLEASE
SYSTEM_UNAME := $(shell uname)
+# Where is unwanted output to be delivered?
+# On Windows, MKS uses the special file "NUL", cygwin uses the customary unix file.
ifeq ($(SYSTEM_UNAME), Windows_NT)
DEV_NULL = NUL
else
+DEV_NULL = /dev/null
+endif
+
ifneq (,$(findstring CYGWIN,$(SYSTEM_UNAME)))
-DEV_NULL = NUL
USING_CYGWIN = true
-else
-DEV_NULL = /dev/null
-endif
endif
ifdef USING_CYGWIN