StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 554402f7 to master

Browse Source 
Change-Id: Ia72f326ca91311c9eaa05aa4f5a134a60171cafb
This commit is contained in:
Ying Wang
2010-09-22 14:11:49 -07:00
parent fed45d859a 554402f76d
commit 1613f4ff1e
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/config.mk
View File

@@ -269,8 +269,8 @@ HOST_JDK_TOOLS_JAR :=
else else
HOST_JDK_TOOLS_JAR:= $(shell $(BUILD_SYSTEM)/find-jdk-tools-jar.sh) HOST_JDK_TOOLS_JAR:= $(shell $(BUILD_SYSTEM)/find-jdk-tools-jar.sh)
ifeq ($(wildcard $(HOST_JDK_TOOLS_JAR)),) ifeq ($(wildcard $(HOST_JDK_TOOLS_JAR)),)
$(error Error: could not find jdk tools.jar, please install JDK-5.0, \ $(error Error: could not find jdk tools.jar, please install JDK-6.0, \
update 12 or higher, which you can download from java.sun.com) which you can download from java.sun.com)
endif endif
endif endif

2
core/main.mk
View File

@@ -75,7 +75,7 @@ build_arch := $(shell uname -m)
ifneq (64,$(findstring 64,$(build_arch))) ifneq (64,$(findstring 64,$(build_arch)))
$(warning ************************************************************) $(warning ************************************************************)
$(warning You are attempting to build on a 32-bit system.) $(warning You are attempting to build on a 32-bit system.)
$(warning Only 64-bit build environments are supported now.) $(warning Only 64-bit build environments are supported beyond froyo/2.2.)
$(warning ************************************************************) $(warning ************************************************************)
$(error stop) $(error stop)
endif endif