aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Ludd <solar@gentoo.org>2010-02-11 14:01:46 -0800
committerNed Ludd <solar@gentoo.org>2010-02-11 14:01:46 -0800
commit5a3aaccf6416753d50d344f1b7268986bc2dd11b (patch)
treee23acd6357073fb72f8f227c02e364cd45d9f50e
parent- take pkg-config update from (awong) Albert J. Wong @ google for the chromiu... (diff)
downloadcrossdev-5a3aaccf6416753d50d344f1b7268986bc2dd11b.tar.gz
crossdev-5a3aaccf6416753d50d344f1b7268986bc2dd11b.tar.bz2
crossdev-5a3aaccf6416753d50d344f1b7268986bc2dd11b.zip
update from ajwong@chromium.org.. : was not needed
Signed-off-by: Ned Ludd <solar@gentoo.org>
-rwxr-xr-xwrappers/cross-pkg-config4
1 files changed, 2 insertions, 2 deletions
diff --git a/wrappers/cross-pkg-config b/wrappers/cross-pkg-config
index 9c12899..8f19da2 100755
--- a/wrappers/cross-pkg-config
+++ b/wrappers/cross-pkg-config
@@ -103,10 +103,10 @@ output=$(echo "${output}" | sed -e 's:\(-[IL][[:space:]]*\)\(/usr\):\1'"${SYSROO
# We turn the output into a newline separate string of options, then use grep
# to look for bad -Is and -Ls. Bad -Is and -Ls are ones that point to things
# outside the ${SYSROOT}.
-bad_lines=$(echo "$output" | # Get the pkg-config output.
+bad_lines=$(echo "$output" | # Get the pkg-config output.
tr -s ' ' | tr ' ' '\n' | # Put each flags on its own line.
grep -E '^(-L|-I)' | # Find all -I and -L lines.
- grep -v -E "..:?${SYSROOT}" # Find all things outside the SYSROOT.
+ grep -v -E "..${SYSROOT}" # Find all things outside the SYSROOT.
)
if [ -n "$bad_lines" ]; then
warn "### falling down so here is a dump state ######"