diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2015-10-22 12:54:45 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-10-26 19:57:54 +0000 |
commit | 00f35b4ae7f94e0fe1c8c77efec401ab5f3c4855 (patch) | |
tree | 55e38db3a1f83af0dfecab6783ab246a0a83646a /configure | |
parent | 3b447ae1f3b60794bdceaa4c590751a97b43bd1b (diff) |
Move pointer size detection entirely to qprocessordetection.h
This commit removes the legacy ptrsize check, which was deficient
because it did not work for multiarch systems (when we supported fat
OS X binaries) and did not work for bootstrap builds because the size
might be different when cross-compiling.
Instead, let's rely on the predefined preprocessor macros to detect
correctly. As a nice side-effect, this fixes 64-bit Android builds
cross-compiled from Windows.
Task-number: QTBUG-48932
Change-Id: I1d0f78915b5942aab07cffff140f9a52b9342f23
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 13 |
1 files changed, 0 insertions, 13 deletions
@@ -6738,19 +6738,6 @@ if [ "$CFG_FRAMEWORK" = "yes" ]; then echo "#define QT_MAC_FRAMEWORK_BUILD" fi -if [ "$XPLATFORM_MAC" = "yes" ]; then - cat <<EOF -#if defined(__LP64__) -# define QT_POINTER_SIZE 8 -#else -# define QT_POINTER_SIZE 4 -#endif -EOF -else - "$unixtests/ptrsize.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" >&3 - echo "#define QT_POINTER_SIZE $?" -fi - if [ "$CFG_ATOMIC64" = "no" ]; then echo "#define QT_NO_STD_ATOMIC64" fi |