From b777f0b4a2b24b33f54954b29fa675e9f3d6bd1b Mon Sep 17 00:00:00 2001 From: Joel Dice Date: Thu, 22 Jan 2015 09:57:15 -0700 Subject: [PATCH] fix Cygwin build 80ce92a introduced a regression which caused the Cygwin build to fail, since it tried to set platform=$(build-platform) when calling make recursively, and platform=cygwin is rejected by the makefile. Instead, we need to use $(bootimage-platform), which normalizes "cygwin" and "mingw32" to "windows". --- makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/makefile b/makefile index 317da35d8c..908f9dc151 100755 --- a/makefile +++ b/makefile @@ -352,13 +352,13 @@ ifneq ($(android),) okio-java = $(android)/external/okhttp/okio/src/main/java okio-javas := $(shell find $(okio-java) -name '*.java') - + bcpkix-java = $(android)/external/bouncycastle/bcpkix/src/main/java bcpkix-javas := $(shell find $(bcpkix-java) -name '*.java') bcprov-java = $(android)/external/bouncycastle/bcprov/src/main/java bcprov-javas := $(shell find $(bcprov-java) -name '*.java') - + android-classes = \ $(call java-classes,$(luni-javas),$(luni-java),$(build)/android) \ $(call java-classes,$(crypto-javas),$(crypto-java),$(build)/android) \ @@ -1677,7 +1677,7 @@ $(classpath-dep): $(classpath-sources) $(classpath-jar-dep) @echo "compiling classpath classes" @mkdir -p $(classpath-build) classes="$(shell $(MAKE) -s --no-print-directory build=$(build) \ - $(classpath-classes) arch=$(build-arch) platform=$(build-platform))"; \ + $(classpath-classes) arch=$(build-arch) platform=$(bootimage-platform))"; \ if [ -n "$${classes}" ]; then \ $(javac) -source 1.6 -target 1.6 \ -d $(classpath-build) -bootclasspath $(boot-classpath) \