diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-01-19 14:15:14 -0800 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-01-19 14:15:14 -0800 |
| commit | b2d1833a216adc467aef46d0e17922c78e8cca25 (patch) | |
| tree | 0cd68efd4ae93aa8f32a4895abef56db564b8ed4 | |
| parent | 4985f06f4e96351c77b88b20bc9ded65daefcd3e (diff) | |
| parent | 0ee32127b60085839b8f47d5687c1e6a8a507014 (diff) | |
| download | build-tools_r9.tar.gz | |
Merge "Add support for custom Linux host toolchains when building the SDK." into tools_r9tools_r9
| -rw-r--r-- | core/combo/HOST_linux-x86.mk | 20 | ||||
| -rw-r--r-- | core/definitions.mk | 8 |
2 files changed, 24 insertions, 4 deletions
diff --git a/core/combo/HOST_linux-x86.mk b/core/combo/HOST_linux-x86.mk index fa2dfe31ca..c871613fe0 100644 --- a/core/combo/HOST_linux-x86.mk +++ b/core/combo/HOST_linux-x86.mk @@ -22,6 +22,26 @@ define get-file-size stat --format "%s" "$(1)" | tr -d '\n' endef +# Special case for the Linux SDK: We need to use a special cross-toolchain +# that generates machine code that will run properly on Ubuntu 8.04 (Hardy) +# By default, the code generated by the Lucid host toolchain will not run +# 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. +# +ifeq ($(TARGET_PRODUCT),sdk) +HOST_SDK_TOOLCHAIN_PREFIX := prebuilt/linux-x86/toolchain/i686-linux-glibc2.7-4.4.3/bin/i686-linux +# Don't do anything if the toolchain is not there +ifneq (,$(strip $(wildcard $(HOST_SDK_TOOLCHAIN_PREFIX)-gcc))) +HOST_CC := $(HOST_SDK_TOOLCHAIN_PREFIX)-gcc +HOST_CXX := $(HOST_SDK_TOOLCHAIN_PREFIX)-g++ +HOST_AR := $(HOST_SDK_TOOLCHAIN_PREFIX)-ar +endif # $(HOST_SDK_TOOLCHAIN_PREFIX)-gcc exists +endif # TARGET_PRODUCT == sdk + # We build everything in 32-bit, because some host tools are # 32-bit-only anyway (emulator, acc), and because it gives us # more consistency between the host tools and the target. diff --git a/core/definitions.mk b/core/definitions.mk index 8675f36e98..b1e6832d8b 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -1011,7 +1011,7 @@ endef # it to be overriden en-masse see combo/linux-arm.make for an example. ifneq ($(HOST_CUSTOM_LD_COMMAND),true) define transform-host-o-to-shared-lib-inner -$(HOST_CXX) \ +$(PRIVATE_CXX) \ -Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \ -Wl,-rpath,\$$ORIGIN/../lib \ -shared -Wl,-soname,$(notdir $@) \ @@ -1061,7 +1061,7 @@ endef # it to be overriden en-masse see combo/linux-arm.make for an example. ifneq ($(TARGET_CUSTOM_LD_COMMAND),true) define transform-o-to-shared-lib-inner -$(TARGET_CXX) \ +$(PRIVATE_CXX) \ $(TARGET_GLOBAL_LDFLAGS) \ -Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \ -Wl,-rpath,\$$ORIGIN/../lib \ @@ -1120,7 +1120,7 @@ endef ifneq ($(TARGET_CUSTOM_LD_COMMAND),true) define transform-o-to-executable-inner -$(TARGET_CXX) \ +$(PRIVATE_CXX) \ $(TARGET_GLOBAL_LDFLAGS) \ -Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \ $(TARGET_GLOBAL_LD_DIRS) \ @@ -1171,7 +1171,7 @@ endef ifneq ($(HOST_CUSTOM_LD_COMMAND),true) define transform-host-o-to-executable-inner -$(HOST_CXX) \ +$(PRIVATE_CXX) \ -Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \ -Wl,-rpath,\$$ORIGIN/../lib \ $(HOST_GLOBAL_LD_DIRS) \ |