LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge change I1db4662e into eclair

Browse Source 
* changes:
  Remove bash-ism from build-toolchain.sh
This commit is contained in:
Android (Google) Code Review
2009-10-15 17:08:32 -04:00
parent bc3c3394fb 1db4662e79
commit ddf1ac3efd
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ndk/build/tools/build-toolchain.sh
View File

@@ -21,7 +21,7 @@
# #
# include common function and variable definitions # include common function and variable definitions
source `dirname $0`/../core/ndk-common.sh . `dirname $0`/../core/ndk-common.sh
# number of jobs to run in parallel when running make # number of jobs to run in parallel when running make
JOBS=$HOST_NUM_CPUS JOBS=$HOST_NUM_CPUS
@@ -424,9 +424,9 @@ if ! timestamp_check gdbserver configure; then
echo "Configure: gdbserver build." echo "Configure: gdbserver build."
mkdir -p $GDBSERVER_BUILD mkdir -p $GDBSERVER_BUILD
cd $GDBSERVER_BUILD && cd $GDBSERVER_BUILD &&
CFLAGS="-g -O2 -static -mandroid -I$ANDROID_SYSROOT/usr/include" \ export CC="$TOOLCHAIN_PREFIX/bin/arm-eabi-gcc" &&
LDFLAGS= \ export CFLAGS="-g -O2 -static -mandroid -I$ANDROID_SYSROOT/usr/include" &&
CC="$TOOLCHAIN_PREFIX/bin/arm-eabi-gcc" \ export LDFLAGS= &&
run $TOOLCHAIN_SRC/gdb-6.6/gdb/gdbserver/configure \ run $TOOLCHAIN_SRC/gdb-6.6/gdb/gdbserver/configure \
--host=arm-eabi-linux \ --host=arm-eabi-linux \
--with-sysroot=$ANDROID_SYSROOT --with-sysroot=$ANDROID_SYSROOT

3
ndk/docs/CHANGES.TXT
View File

@@ -33,6 +33,9 @@ OTHER FIXES & CHANGES:
This change is to help people easily package experimental NDK releases to This change is to help people easily package experimental NDK releases to
test and distribute fixes and improvements. test and distribute fixes and improvements.
- Remove bash-isms from build/tools/build-toolchain.sh. Now it's possible to
build it with the 'dash' shell on Debian-based systems (tested on Ubuntu 8.04)
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
android-ndk-1.6_r1 android-ndk-1.6_r1