diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-02-04 13:43:37 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-04 22:40:06 +0100 |
| commit | 31b4c5aa05376c2270122679c97a5727dc743d92 (patch) | |
| tree | 91802a428f2bd3e9c512e6f329beae75eb59a31e | |
| parent | 3f75fb8d8f25af5b79b71ae74f453a2b220a11ce (diff) | |
Use $CFG_ARCH even if src/corelib/arch/$CFG_ARCH does not exist
Recent commits in src/corelib/arch have removed empty directories,
which cause configure to assume that the architecture is not supported.
This assumption is wrong, due to changes in
src/corelib/thread/qbasicatomic.h to include the correct QAtomic*
implementation based on compiler pre-defined macros instead of the
architecture found by configure.
Change-Id: I026958fb9af8af62e295e68a4643c37ac9395dc6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rwxr-xr-x | configure | 23 |
1 files changed, 0 insertions, 23 deletions
@@ -2949,29 +2949,6 @@ arm*) ;; esac -if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " '$CFG_ARCH' is supported" - fi -else - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " '$CFG_ARCH' is unsupported, using 'generic'" - fi - CFG_ARCH=generic -fi -if [ "$CFG_HOST_ARCH" != "$CFG_ARCH" ]; then - if [ -d "$relpath/src/corelib/arch/$CFG_HOST_ARCH" ]; then - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " '$CFG_HOST_ARCH' is supported" - fi - else - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " '$CFG_HOST_ARCH' is unsupported, using 'generic'" - fi - CFG_HOST_ARCH=generic - fi -fi - if [ "$OPT_VERBOSE" = "yes" ]; then echo "System architecture: '$CFG_ARCH'" if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then |