summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--webkit/port/DerivedSources.make4
2 files changed, 3 insertions, 3 deletions
diff --git a/DEPS b/DEPS
index 460c3d2..9cc3bb1 100644
--- a/DEPS
+++ b/DEPS
@@ -45,7 +45,7 @@ deps = {
deps_os = {
"win": {
"src/third_party/cygwin":
- "/trunk/deps/third_party/cygwin@3248",
+ "/trunk/deps/third_party/cygwin@11176",
"src/third_party/python_24":
"/trunk/deps/third_party/python_24@7444",
diff --git a/webkit/port/DerivedSources.make b/webkit/port/DerivedSources.make
index de46e40..d41c7c0 100644
--- a/webkit/port/DerivedSources.make
+++ b/webkit/port/DerivedSources.make
@@ -956,14 +956,14 @@ endif
#endif
CSSPropertyNames.h : $(WEBCORE_CSS_PROPERTY_NAMES) css/makeprop.pl
- if sort $(WEBCORE_CSS_PROPERTY_NAMES) | uniq -d | grep -E '^[^#]'; then echo 'Duplicate value!'; exit 1; fi
+ if dos2unix $(WEBCORE_CSS_PROPERTY_NAMES) | sort | uniq -d | grep -E '^[^#]'; then echo 'Duplicate value!'; exit 1; fi
cat $(WEBCORE_CSS_PROPERTY_NAMES) > CSSPropertyNames.in
perl "$(WebCore)/css/makeprop.pl"
CSSValueKeywords.h : $(WEBCORE_CSS_VALUE_KEYWORDS) css/makevalues.pl
# Lower case all the values, as CSS values are case-insensitive
perl -ne 'print lc' $(WEBCORE_CSS_VALUE_KEYWORDS) > CSSValueKeywords.in
- if sort CSSValueKeywords.in | uniq -d | grep -E '^[^#]'; then echo 'Duplicate value!'; exit 1; fi
+ if dos2unix CSSValueKeywords.in | sort | uniq -d | grep -E '^[^#]'; then echo 'Duplicate value!'; exit 1; fi
perl "$(WebCore)/css/makevalues.pl"
# DOCTYPE strings