Skip to content

Commit

Permalink
Revert "Save the pkg-config settings in config.status"
Browse files Browse the repository at this point in the history
it's somewhat questionable to save the environment of pkg-config, but
not that of many other things we use.
additionally, we now have logic to automatically set it up from the
sysroot when it's missing.

This reverts commit 228392a.

Change-Id: I0612c196c9a5023bb3ef436aebfb87cb46d8cd14
Reviewed-by: Lars Knoll <[email protected]>
Reviewed-by: Thiago Macieira <[email protected]>
  • Loading branch information
ossilator committed Jul 22, 2016
1 parent 34173e9 commit 9774ae3
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -2003,10 +2003,6 @@ fi'`

[ -f "$outpath/config.status" ] && rm -f "$outpath/config.status"
echo "#!/bin/sh" > "$outpath/config.status"
[ -n "$PKG_CONFIG_SYSROOT_DIR" ] && \
echo "export PKG_CONFIG_SYSROOT_DIR=$PKG_CONFIG_SYSROOT_DIR" >> "$outpath/config.status"
[ -n "$PKG_CONFIG_LIBDIR" ] && \
echo "export PKG_CONFIG_LIBDIR=$PKG_CONFIG_LIBDIR" >> "$outpath/config.status"
echo "$CONFIG_STATUS \"\$@\"" >> "$outpath/config.status"
chmod +x "$outpath/config.status"
fi
Expand Down

0 comments on commit 9774ae3

Please sign in to comment.