From 31b4c5aa05376c2270122679c97a5727dc743d92 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Sat, 4 Feb 2012 13:43:37 +0100 Subject: 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 Reviewed-by: Oswald Buddenhagen --- configure | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/configure b/configure index 46bebb1b0d..5e78360fa6 100755 --- a/configure +++ b/configure @@ -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 -- cgit v1.2.3