better build arch detection

kived · kived · commit c10b5ef2fee4 · 2015-05-15T10:13:29.000-05:00
diff --git a/recipes/python/recipe.sh b/recipes/python/recipe.sh
@@ -78,6 +78,9 @@ function build_python() {
 	try cp $BUILD_hostpython/hostpython .
 	try cp $BUILD_hostpython/hostpgen .
 
+	export BUILDARCH=$(gcc -dumpmachine)
+	export HOSTARCH=arm-eabi
+
 	push_arm
 
 	# openssl activated ?
@@ -96,16 +99,6 @@ function build_python() {
 
 	# CFLAGS for python ctypes library
 	#export CFLAGS="$CFLAGS -DNO_MALLINFO"
-	machine=$(uname -m)
-	system=$(uname -s)
-	system=${system,,}  # convert to lowercase
-
-	if [ "$machine" == "i386" ]; then
-		machine=x86
-	fi
-
-	export BUILDARCH=${machine}-${system}-gnu
-	export HOSTARCH=arm-eabi
 
 	try ./configure --host=$HOSTARCH --build=$BUILDARCH OPT=$OFLAG --prefix="$BUILD_PATH/python-install" --enable-shared --disable-toolbox-glue --disable-framework
 	echo ./configure --host=$HOSTARCH --build=$BUILDARCH OPT=$OFLAG --prefix="$BUILD_PATH/python-install" --enable-shared --disable-toolbox-glue --disable-framework
@@ -125,13 +118,14 @@ function build_python() {
 	$MAKE install HOSTPYTHON=$BUILD_python/hostpython HOSTPGEN=$BUILD_python/hostpgen CROSS_COMPILE_TARGET=yes INSTSONAME=libpython2.7.so
 	pop_arm
 
-	if [ "X$system" == "Xdarwin" ]; then
+	system=$(uname -s)
+	if [ "X$system" == "XDarwin" ]; then
 		try cp $RECIPE_python/patches/_scproxy.py $BUILD_python/Lib/
 		try cp $RECIPE_python/patches/_scproxy.py $BUILD_PATH/python-install/lib/python2.7/
 	fi
 	try cp $BUILD_hostpython/hostpython $HOSTPYTHON
 	try cp libpython2.7.so $LIBS_PATH/
-	try cp -a build/lib.*-${machine}-2.7/_ctypes*.so $LIBS_PATH
+	try cp -a build/lib.*-2.7/_ctypes*.so $LIBS_PATH
 
 	# reduce python
 	rm -rf "$BUILD_PATH/python-install/lib/python2.7/test"
