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

am 865d851a: Merge "Remove the obsolete comments and change the misleading var name."

Browse Source 
* commit '865d851a8012e13c35d573d98770b7187d32b7f7':
  Remove the obsolete comments and change the misleading var name.
This commit is contained in:
Ying Wang
2012-11-12 14:45:59 -08:00
committed by Android Git Automerger
parent abfb25226a 865d851a80
commit eb98e08893
2 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/combo/HOST_darwin-x86.mk
View File

@@ -75,11 +75,11 @@ else
endif endif
HOST_TOOLCHAIN_ROOT := prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1 HOST_TOOLCHAIN_ROOT := prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1
HOST_SDK_TOOLCHAIN_PREFIX := $(HOST_TOOLCHAIN_ROOT)/bin/i686-apple-darwin$(gcc_darwin_version) HOST_TOOLCHAIN_PREFIX := $(HOST_TOOLCHAIN_ROOT)/bin/i686-apple-darwin$(gcc_darwin_version)
# Don't do anything if the toolchain is not there # Don't do anything if the toolchain is not there
ifneq (,$(strip $(wildcard $(HOST_SDK_TOOLCHAIN_PREFIX)-gcc))) ifneq (,$(strip $(wildcard $(HOST_TOOLCHAIN_PREFIX)-gcc)))
HOST_CC := $(HOST_SDK_TOOLCHAIN_PREFIX)-gcc HOST_CC := $(HOST_TOOLCHAIN_PREFIX)-gcc
HOST_CXX := $(HOST_SDK_TOOLCHAIN_PREFIX)-g++ HOST_CXX := $(HOST_TOOLCHAIN_PREFIX)-g++
ifeq ($(mac_sdk_version),10.8) ifeq ($(mac_sdk_version),10.8)
# Mac SDK 10.8 no longer has stdarg.h, etc # Mac SDK 10.8 no longer has stdarg.h, etc
host_toolchain_header := $(HOST_TOOLCHAIN_ROOT)/lib/gcc/i686-apple-darwin$(gcc_darwin_version)/4.2.1/include host_toolchain_header := $(HOST_TOOLCHAIN_ROOT)/lib/gcc/i686-apple-darwin$(gcc_darwin_version)/4.2.1/include
@@ -88,7 +88,7 @@ endif
else else
HOST_CC := gcc HOST_CC := gcc
HOST_CXX := g++ HOST_CXX := g++
endif # $(HOST_SDK_TOOLCHAIN_PREFIX)-gcc exists endif # $(HOST_TOOLCHAIN_PREFIX)-gcc exists
HOST_AR := $(AR) HOST_AR := $(AR)
HOST_STRIP := $(STRIP) HOST_STRIP := $(STRIP)
HOST_STRIP_COMMAND = $(HOST_STRIP) --strip-debug $< -o $@ HOST_STRIP_COMMAND = $(HOST_STRIP) --strip-debug $< -o $@

24
core/combo/HOST_linux-x86.mk
View File

@@ -22,23 +22,15 @@ define get-file-size
stat --format "%s" "$(1)" | tr -d '\n' stat --format "%s" "$(1)" | tr -d '\n'
endef endef
# Special case for the Linux SDK: We need to use a special cross-toolchain # Previously the prebiult host toolchain is used only for the sdk build,
# that generates machine code that will run properly on Ubuntu 8.04 (Hardy) # that's why we have "sdk" in the path name.
# By default, the code generated by the Lucid host toolchain will not run HOST_TOOLCHAIN_PREFIX := prebuilts/tools/gcc-sdk
# on previous versions of the platform, due to GLibc ABI mistmatches
# (Lucid is 2.11, Hardy is 2.7)
#
# Note that components that need to be built as 64-bit (e.g. clearsilver
# which is loaded by the 64-bit JVM through JNI), will have to use
# LOCAL_CC and LOCAL_CXX to override this.
#
HOST_SDK_TOOLCHAIN_PREFIX := prebuilts/tools/gcc-sdk
# Don't do anything if the toolchain is not there # Don't do anything if the toolchain is not there
ifneq (,$(strip $(wildcard $(HOST_SDK_TOOLCHAIN_PREFIX)/gcc))) ifneq (,$(strip $(wildcard $(HOST_TOOLCHAIN_PREFIX)/gcc)))
HOST_CC := $(HOST_SDK_TOOLCHAIN_PREFIX)/gcc HOST_CC := $(HOST_TOOLCHAIN_PREFIX)/gcc
HOST_CXX := $(HOST_SDK_TOOLCHAIN_PREFIX)/g++ HOST_CXX := $(HOST_TOOLCHAIN_PREFIX)/g++
HOST_AR := $(HOST_SDK_TOOLCHAIN_PREFIX)/ar HOST_AR := $(HOST_TOOLCHAIN_PREFIX)/ar
endif # $(HOST_SDK_TOOLCHAIN_PREFIX)/gcc exists endif # $(HOST_TOOLCHAIN_PREFIX)/gcc exists
ifneq ($(strip $(BUILD_HOST_64bit)),) ifneq ($(strip $(BUILD_HOST_64bit)),)
# By default we build everything in 32-bit, because it gives us # By default we build everything in 32-bit, because it gives us