aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-02-11 20:47:01 -0500
committerMike Frysinger <vapier@gentoo.org>2010-02-11 20:47:01 -0500
commit6f6d2116e0ba4e6cb2f08868c92002783f7cc5b7 (patch)
treeec0dcc5ea4f49ba4e8cdc1bc483bf39365e1d048
parentcrossdev: show version in summary output (diff)
downloadcrossdev-6f6d2116e0ba4e6cb2f08868c92002783f7cc5b7.tar.gz
crossdev-6f6d2116e0ba4e6cb2f08868c92002783f7cc5b7.tar.bz2
crossdev-6f6d2116e0ba4e6cb2f08868c92002783f7cc5b7.zip
cross-pkg-config: tweak path updates with fewer commands
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rwxr-xr-xwrappers/cross-pkg-config8
1 files changed, 4 insertions, 4 deletions
diff --git a/wrappers/cross-pkg-config b/wrappers/cross-pkg-config
index 8f19da2..1237a28 100755
--- a/wrappers/cross-pkg-config
+++ b/wrappers/cross-pkg-config
@@ -103,12 +103,12 @@ 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.
- tr -s ' ' | tr ' ' '\n' | # Put each flags on its own line.
- grep -E '^(-L|-I)' | # Find all -I and -L lines.
+bad_lines=$(echo "${output}" | # Get the pkg-config output.
+ tr -s ' ' '\n' | # Put each flags on its own line.
+ grep '^-[LI]' | # Find all -I and -L lines.
grep -v -E "..${SYSROOT}" # Find all things outside the SYSROOT.
)
-if [ -n "$bad_lines" ]; then
+if [ -n "${bad_lines}" ] ; then
warn "### falling down so here is a dump state ######"
pkg-config --debug "$@" 1>&2
warn "### end of dump ###############################"