diff options
| -rw-r--r-- | ACE/ChangeLog | 11 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_linux_common.GNU | 20 |
2 files changed, 31 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 152da594142..db5b1b07307 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,14 @@ +Mon Nov 30 10:08:00 UTC 2009 Martin Corino <mcorino@remedy.nl> + + * include/makeinclude/platform_linux_common.GNU: + + Added some rules to support cross builds. + Setting the environment variable (or make variable) CROSS_COMPILE + to the platform tool prefix will redefine the CC, CXX and AR + variables and add a '-Wl,-rpath-link' option to the LDFLAGS. + If the HOST_ROOT variable has been set as well TAO_IDLxxx variables + will be redefined as well. + Mon Nov 30 08:58:00 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * bin/diff-builds-and-group-fixed-tests-only.sh: diff --git a/ACE/include/makeinclude/platform_linux_common.GNU b/ACE/include/makeinclude/platform_linux_common.GNU index 8a19abcdde1..06d58031f97 100644 --- a/ACE/include/makeinclude/platform_linux_common.GNU +++ b/ACE/include/makeinclude/platform_linux_common.GNU @@ -118,6 +118,26 @@ SYSARCH := $(shell uname -m) ifeq ($(insure),1) CC = insure CXX = insure +else + ifneq ($(CROSS_COMPILE),) + # Build using the cross-tools + CC = ${CROSS_COMPILE}gcc + CXX = ${CROSS_COMPILE}g++ + AR = ${CROSS_COMPILE}ar + # Cross-linker requires this for linked in shared libs that depend + # themselves on other shared libs (not directly linked in) + LDFLAGS += -Wl,-rpath-link,$(ACE_ROOT)/lib + ifneq (,$(HOST_ROOT)) + TAO_IDLFLAGS += -g $(HOST_ROOT)/bin/ace_gperf + TAO_IDL = $(HOST_ROOT)/bin/tao_idl + TAO_IDL3_TO_IDL2 = $(HOST_ROOT)/bin/tao_idl3_to_idl2 + TAO_IDL_DEP = $(TAO_IDL) + TAO_IDL3_TO_IDL2_DEP = $(TAO_IDL3_TO_IDL2) + # make sure to use the target compiler, not the cross-compiler + # as preprocessor for the cross-compiled idl tools + TAO_IDL_PREPROCESSOR = gcc + endif + endif endif PIC = -fPIC |