AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use $CFG_ARCH even if src/corelib/arch/$CFG_ARCH does not exist

Browse Source 
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>
This commit is contained in:
Bradley T. Hughes 2012-02-04 13:43:37 +01:00 committed by Qt by Nokia
parent 3f75fb8d8f
commit 31b4c5aa05
1 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
configure vendored
View File

@ -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