diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-07-06 13:08:46 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-07-22 10:28:18 +0000 |
| commit | 9774ae3d2d46170de05800b6455a787e8c150ed3 (patch) | |
| tree | cd03f43c73888ee939e27f8d46c1314911fc27f6 /configure | |
| parent | 34173e93502c2cdf2f4e644c53af71ef6ccf03a1 (diff) | |
Revert "Save the pkg-config settings in config.status"
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 228392aff231f105116738df6c4286af257407c7.
Change-Id: I0612c196c9a5023bb3ef436aebfb87cb46d8cd14
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -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 |