[haiku-commits] r35400 - haiku/trunk
- From: ingo_weinhold@xxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 3 Feb 2010 22:21:39 +0100 (CET)
Author: bonefish
Date: 2010-02-03 22:21:39 +0100 (Wed, 03 Feb 2010)
New Revision: 35400
Changeset: http://dev.haiku-os.org/changeset/35400/haiku
Modified:
haiku/trunk/configure
Log:
Use the same names for the HAIKU_[HOST_]USE_32BIT and HAIKU_[HOST_]USE_XATTR
variables in the script and in generated BuildConfig file. Otherwise the
--update option wouldn't correctly pick it up.
Modified: haiku/trunk/configure
===================================================================
--- haiku/trunk/configure 2010-02-03 21:11:31 UTC (rev 35399)
+++ haiku/trunk/configure 2010-02-03 21:21:39 UTC (rev 35400)
@@ -284,8 +284,8 @@
HAIKU_DISTRO_COMPATIBILITY=default
TARGET_PLATFORM=haiku
HAIKU_USE_GCC_PIPE=0
-HAIKU_USE_32BIT=0
-HAIKU_USE_XATTR=0
+HAIKU_HOST_USE_32BIT=0
+HAIKU_HOST_USE_XATTR=0
HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR=
HAIKU_ADD_ALTERNATIVE_GCC_LIBS=
HOST_GCC_LD=`gcc -print-prog-name=ld`
@@ -394,8 +394,8 @@
-j*) buildCrossToolsJobs="$1"; shift 1;;
--target=*) TARGET_PLATFORM=`echo $1 | cut -d'=' -f2-`;
shift 1;;
--use-gcc-pipe) HAIKU_USE_GCC_PIPE=1; shift 1;;
- --use-32bit) HAIKU_USE_32BIT=1; shift 1;;
- --use-xattr) HAIKU_USE_XATTR=1; shift 1;;
+ --use-32bit) HAIKU_HOST_USE_32BIT=1; shift 1;;
+ --use-xattr) HAIKU_HOST_USE_XATTR=1; shift 1;;
*) echo Invalid argument: \`$1\';
exit 1;;
esac
done
@@ -415,7 +415,7 @@
Darwin) HOST_PLATFORM=darwin ;;
FreeBSD) HOST_PLATFORM=freebsd
SFDISK_BINARY=sfdisk-linux
- if [ "$HAIKU_USE_32BIT" = 1 ] ; then
+ if [ "$HAIKU_HOST_USE_32BIT" = 1 ] ; then
echo Unsupported platform: FreeBSD
${platformMachine}
exit 1
fi ;;
@@ -517,8 +517,8 @@
HAIKU_ENABLE_MULTIUSER ?= "${HAIKU_ENABLE_MULTIUSER}" ;
HAIKU_DISTRO_COMPATIBILITY ?=
"${HAIKU_DISTRO_COMPATIBILITY}" ;
HAIKU_USE_GCC_PIPE ?=
"${HAIKU_USE_GCC_PIPE}" ;
-HAIKU_HOST_USE_32BIT ?= "${HAIKU_USE_32BIT}" ;
-HAIKU_HOST_USE_XATTR ?= "${HAIKU_USE_XATTR}" ;
+HAIKU_HOST_USE_32BIT ?= "${HAIKU_HOST_USE_32BIT}" ;
+HAIKU_HOST_USE_XATTR ?= "${HAIKU_HOST_USE_XATTR}" ;
HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR ?= ${HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR} ;
HAIKU_ADD_ALTERNATIVE_GCC_LIBS ?= ${HAIKU_ADD_ALTERNATIVE_GCC_LIBS} ;
Other related posts:
- » [haiku-commits] r35400 - haiku/trunk - ingo_weinhold
