Merge "Fix "ndk-build clean" to not delete prebuilt static libraries"
diff --git a/build/tools/build-host-awk.sh b/build/tools/build-host-awk.sh
index 84890b7..b0c0957 100755
--- a/build/tools/build-host-awk.sh
+++ b/build/tools/build-host-awk.sh
@@ -61,6 +61,10 @@
if [ "$TRY64" = "yes" ]; then
BUILD_TRY64=yes
fi
+V=0
+if [ "$VERBOSE2" = "yes" ]; then
+ V=1
+fi
log "Configuring the build"
mkdir -p $BUILD_DIR && rm -rf $BUILD_DIR/*
@@ -73,7 +77,8 @@
-j $NUM_JOBS \
BUILD_DIR="$BUILD_DIR" \
MINGW="$BUILD_MINGW" \
- TRY64="$BUILD_TRY64"
+ TRY64="$BUILD_TRY64" \
+ V="$V"
fail_panic "Failed to build the awk-$AWK_VERSION executable!"
log "Copying executable to prebuilt location"
diff --git a/build/tools/build-host-sed.sh b/build/tools/build-host-sed.sh
index 416a5fc..38c4b11 100755
--- a/build/tools/build-host-sed.sh
+++ b/build/tools/build-host-sed.sh
@@ -61,7 +61,13 @@
cd $BUILD_DIR &&
CFLAGS=$HOST_CFLAGS" -O2 -s" &&
export CC CFLAGS &&
-run $SED_SRCDIR/configure --disable-nls --disable-rpath --disable-i18n --disable-acl
+run $SED_SRCDIR/configure \
+ --disable-nls \
+ --disable-rpath \
+ --disable-i18n \
+ --disable-acl \
+ --host=$ABI_CONFIGURE_HOST \
+ --build=$ABI_CONFIGURE_BUILD
fail_panic "Failed to configure the sed-$SED_VERSION build!"
log "Building sed"
diff --git a/ndk-build.cmd b/ndk-build.cmd
index f901a07..f5ebf38 100644
--- a/ndk-build.cmd
+++ b/ndk-build.cmd
@@ -17,7 +17,7 @@
rem Check if NDK_HOST_32BIT is not set to 1/true, Windows is 64-bit, and 64-bit make exists
if "%NDK_HOST_32BIT%"=="1" set NDK_MAKE=
if "%NDK_HOST_32BIT%"=="true" set NDK_MAKE=
-if not exist %NDK_MAKE% set NDK_MAKE=
+if not exist "%NDK_MAKE%" set NDK_MAKE=
if "%ProgramW6432%"=="" set NDK_MAKE=
rem Otherwise fall back to 32-bit make
diff --git a/sources/host-tools/nawk-20071023/GNUmakefile b/sources/host-tools/nawk-20071023/GNUmakefile
index 8c976aa..631227f 100644
--- a/sources/host-tools/nawk-20071023/GNUmakefile
+++ b/sources/host-tools/nawk-20071023/GNUmakefile
@@ -37,6 +37,8 @@
CC := i586-pc-mingw32msvc-gcc
endif
EXE := .exe
+else
+WINE :=
endif
PROGRAM := $(BUILD_DIR)/ndk-awk$(EXE)
@@ -82,7 +84,7 @@
$(PROCTAB_C): $(MAKETAB) $(YTAB_H)
@echo "Gen: $(notdir $@)"
- $(hide)$(MAKETAB) $(YTAB_H) > $@
+ $(hide)$(WINE) $(MAKETAB) $(YTAB_H) > $@
$(PROGRAM): $(OBJECTS)
