diff options
| author | David 'Digit' Turner <digit@google.com> | 2010-12-07 14:35:12 +0100 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2010-12-09 17:20:40 +0100 |
| commit | 99dcb2c517a0d9d9e7246cca9e668c04a8e348b8 (patch) | |
| tree | 1b5751d8f3566bd3f202eb48143fb85ceba2d049 | |
| parent | 3631b24360f563cd6cbba8b023597acd69541dcb (diff) | |
| download | ndk-99dcb2c517a0d9d9e7246cca9e668c04a8e348b8.tar.gz | |
ndk-build: Fix cygwin GNU Make check.
This fixes the Cygwin installation check within ndk-build to
handle install paths containing spaces.
Note that the script itself doesn't check for spaces in the
path, but this is done later in the GNU Makefile itself.
Change-Id: Icfe2aaab2fac1a5621d4e649dad62436c768c579
| -rw-r--r-- | docs/CHANGES.html | 11 | ||||
| -rwxr-xr-x | ndk-build | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/docs/CHANGES.html b/docs/CHANGES.html index ac639501f..e8b4a9022 100644 --- a/docs/CHANGES.html +++ b/docs/CHANGES.html @@ -1,6 +1,17 @@ <html><body><pre>Android NDK ChangeLog: ------------------------------------------------------------------------------- +android-ndk-r5b + +This release fixes a few bugs in r5. There are no new features. + +OTHER FIXES & CHANGES: + +- ndk-build: Handle installation paths containing spaces when checking + cygwin installation. Before that, the script complained that the user + was using an incorrect version of GNU Make (even if he had the right one). + +------------------------------------------------------------------------------- android-ndk-r5 IMPORTANT BUG FIXES: @@ -66,7 +66,7 @@ fi if [ "$OSTYPE" = "cygwin" ] ; then GNUMAKE=`cygpath -u $GNUMAKE` PROGDIR_MIXED=`cygpath -m $PROGDIR` - CYGWIN_GNUMAKE=`$GNUMAKE -f $PROGDIR_MIXED/build/core/check-cygwin-make.mk 2>&1` + CYGWIN_GNUMAKE=`$GNUMAKE -f "$PROGDIR_MIXED/build/core/check-cygwin-make.mk" 2>&1` if [ $? != 0 ] ; then echo "ERROR: You are using a non-Cygwin compatible Make program." echo "Currently using: `cygpath -m $GNUMAKE`" |