diff options
author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-06-25 14:19:02 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-06-29 15:06:00 +0000 |
commit | 8b304ff26f7b7378ff149fa66a8189a6f61a35b3 (patch) | |
tree | e2e6393c5f0d038712518a31356dc1e126e36943 /configure | |
parent | f88f93efb6b6b0bc594e4ebae6dc00efa3a19562 (diff) |
configure: Infer licheck bitness from platform argument
We build our 32 bit Linux packages nowadays on Red Hat 64 bit with
-platform linux-g++-32. Honor this when selecting the right licheck
binary to use.
Change-Id: I08527295bc461c8cdd07e81a10c93a8f010b787d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 18 |
1 files changed, 14 insertions, 4 deletions
@@ -2965,11 +2965,21 @@ if [ -f "$relpath"/LICENSE.PREVIEW.COMMERCIAL ] && [ $COMMERCIAL_USER = "yes" ]; EditionString="Technology Preview" elif [ $COMMERCIAL_USER = "yes" ]; then if [ $UNAME_SYSTEM = "Linux" ]; then - if file -L /bin/sh | grep -q "64-bit" ; then - Licheck=licheck64 - else + case "$PLATFORM" in + *-32) Licheck=licheck32 - fi + ;; + *-64) + Licheck=licheck64 + ;; + *) + if file -L /bin/sh | grep -q "64-bit" ; then + Licheck=licheck64 + else + Licheck=licheck32 + fi + ;; + esac elif [ $UNAME_SYSTEM = "Darwin" ]; then Licheck=licheck_mac else |