From d3f3e3efa56746154da0cfd8eaa3b0a5ceae3696 Mon Sep 17 00:00:00 2001 From: Bob Jamison Date: Sat, 2 Dec 2006 15:32:37 +0000 Subject: allow 0-length properties (bzr r2062) --- buildtool.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'buildtool.cpp') diff --git a/buildtool.cpp b/buildtool.cpp index e61caf9c7..747e9577e 100644 --- a/buildtool.cpp +++ b/buildtool.cpp @@ -7945,8 +7945,9 @@ bool Make::parsePropertyFile(const String &fileName, return false; } val = s.substr(p); - if (key.size()==0 || val.size()==0) + if (key.size()==0) continue; + //allow property to be set, even if val="" //trace("key:'%s' val:'%s'", key.c_str(), val.c_str()); //See if we wanted to overload this property @@ -7991,10 +7992,8 @@ bool Make::parseProperty(Element *elem) { if (!getAttribute(elem, "location", val)) return false; - if (val.size() > 0) - { - properties[attrVal] = val; - } + //let the property exist, even if not defined + properties[attrVal] = val; } //See if we wanted to overload this property std::map::iterator iter = -- cgit v1.2.3