diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-06-25 16:19:40 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-26 16:28:32 +0200 |
| commit | 4fdf33a800874c89f44b3642a439adb5463e7921 (patch) | |
| tree | 160c00d73069892793a05bbadb2ee82187ca6480 | |
| parent | f30a905ea46edbb6303476aa1119686c490f6428 (diff) | |
configure: Use $AWK instead of plain 'awk'
The $AWK variable already contains the best awk version
available. Possible values for this variable are: gawk, nawk or
awk.
Using just awk fails on Solaris with:
user@localhost:~/qtbase$ ./configure -platform solaris-g++
awk: syntax error near line 4
awk: bailing out near line 4
This is the Qt Open Source Edition.
Change-Id: I02a17915e8b27a5ce7e831a1225872cf460b3a6b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -3036,7 +3036,7 @@ gccout=`LC_ALL=C $TEST_COMPILER $SYSROOT_FLAG $TEST_COMPILER_CXXFLAGS -xc++ -E - libdirs=`echo "$gccout" | sed -n -e 's/^LIBRARY_PATH=\(.*\)/\1/p'` DEFAULT_LIBDIRS=`IFS=${HOST_DIRLIST_SEP}; for i in $libdirs; do test -d "$i" && cd "$i" && pwd; done` # extract from indented lines between '#include <...> search starts here:' and 'End of search list.' -DEFAULT_INCDIRS=`echo "$gccout" | awk ' +DEFAULT_INCDIRS=`echo "$gccout" | $AWK ' /^End of search/ { yup=0 } / \(framework directory\)$/ { next } yup { print substr($0, 2) } @@ -6086,7 +6086,7 @@ case "$XPLATFORM" in ;; solaris-cc*) # Check the compiler version - case `${QMAKE_CONF_COMPILER} -V 2>&1 | awk '{print $4}'` in + case `${QMAKE_CONF_COMPILER} -V 2>&1 | $AWK '{print $4}'` in 5.[012345678]) canBuildWebKit="no" canBuildQtXmlPatterns="no" |