Merge
authordcubed
Fri, 06 Mar 2015 08:43:02 -0800
changeset 29439 4ed3700d1e23
parent 29309 00e460692150 (current diff)
parent 29438 6166fd4a617f (diff)
child 29441 19feb1c4487f
child 29562 779fa8e10961
Merge
make/common/JavaCompilation.gmk
--- a/make/common/JavaCompilation.gmk	Fri Mar 06 04:58:52 2015 -0800
+++ b/make/common/JavaCompilation.gmk	Fri Mar 06 08:43:02 2015 -0800
@@ -387,7 +387,7 @@
 	$(MKDIR) -p $$(@D)
 	export LC_ALL=C ; ( $(CAT) $$< && $(ECHO) "" ) \
 	    | $(SED) -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' \
-	        -e 's/\([^\\]\)!/\1\\!/g' -e 's/#.*/#/g' \
+	        -e 's/\([^\\]\)!/\1\\!/g' -e 's/^[ 	]*#.*/#/g' \
 	    | $(SED) -f "$(SRC_ROOT)/make/common/support/unicode2x.sed" \
 	    | $(SED) -e '/^#/d' -e '/^$$$$/d' \
 	        -e :a -e '/\\$$$$/N; s/\\\n//; ta' \