diff options
| author | mitza <mitza@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-06-08 18:46:54 +0000 |
|---|---|---|
| committer | mitza <mitza@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-06-08 18:46:54 +0000 |
| commit | 82ca6f504ae3c870fc09ab735b074e4c04d2b3d1 (patch) | |
| tree | 6286a929d3014c8bf9ef6a9686ac47672aeaafe3 /ACE/include/makeinclude | |
| parent | 917e64db8d84e4c39ab3c2da020974a2d4910b1e (diff) | |
| download | ATCD-82ca6f504ae3c870fc09ab735b074e4c04d2b3d1.tar.gz | |
ChangeLogTag: Mon Jun 8 18:39:58 UTC 2009 Adam Mitz <mitza@ociweb.com>
Diffstat (limited to 'ACE/include/makeinclude')
| -rw-r--r-- | ACE/include/makeinclude/platform_lynxos.GNU | 3 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_sunos5_sunc++.GNU | 2 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_vxworks6.3.GNU | 6 |
3 files changed, 10 insertions, 1 deletions
diff --git a/ACE/include/makeinclude/platform_lynxos.GNU b/ACE/include/makeinclude/platform_lynxos.GNU index 6279f4d2624..b2ea6d788c9 100644 --- a/ACE/include/makeinclude/platform_lynxos.GNU +++ b/ACE/include/makeinclude/platform_lynxos.GNU @@ -96,6 +96,9 @@ ifeq ($(shared_libs),1) CPPFLAGS += -DACE_HAS_SVR4_DYNAMIC_LINKING LDFLAGS += -mshared LIBS += -ldl + ifeq ($(CROSS-COMPILE),1) + LDFLAGS += -Wl,-rpath-link,$(ACE_ROOT)/lib + endif else LIBS += -lnetinet -lnsl endif diff --git a/ACE/include/makeinclude/platform_sunos5_sunc++.GNU b/ACE/include/makeinclude/platform_sunos5_sunc++.GNU index 5bf5127adaf..0c4663d5796 100644 --- a/ACE/include/makeinclude/platform_sunos5_sunc++.GNU +++ b/ACE/include/makeinclude/platform_sunos5_sunc++.GNU @@ -42,7 +42,7 @@ compat4 ?= 0 debug ?= 1 -distrib ?= 0 +distrib ?= 1 stdcpplib ?= 1 threads ?= 1 versioned_so ?= 1 diff --git a/ACE/include/makeinclude/platform_vxworks6.3.GNU b/ACE/include/makeinclude/platform_vxworks6.3.GNU index 7bdc6254526..efcb91d19b5 100644 --- a/ACE/include/makeinclude/platform_vxworks6.3.GNU +++ b/ACE/include/makeinclude/platform_vxworks6.3.GNU @@ -64,6 +64,7 @@ ifeq ("$(WIND_HOST_TYPE)","x86-win32") CIAO_ROOT:=$(subst \,/,$(CIAO_ROOT)) HOST_ROOT:=$(subst \,/,$(HOST_ROOT)) override RM=rm -f + HOST_EXE_EXT = .exe endif # x86-win32 ifneq (,$(HOST_ROOT)) @@ -80,6 +81,10 @@ endif TAO_IDL_DEP = $(TAO_IDL) TAO_IDL3_TO_IDL2_DEP = $(TAO_IDL3_TO_IDL2) CIDLC_DEP = $(CIDLC) +else +TAO_IDL_DEP = $(TAO_IDL)$(HOST_EXE_EXT) +TAO_IDL3_TO_IDL2_DEP = $(TAO_IDL3_TO_IDL2)$(HOST_EXE_EXT) +CIDLC_DEP = $(CIDLC)$(HOST_EXE_EXT) endif HOST_DIR = $(WIND_BASE)/host/$(WIND_HOST_TYPE) @@ -224,6 +229,7 @@ ifeq ("$(TOOL_FAMILY)","gnu") ifeq ($(rtp),1) PIC = -fpic SOFLAGS += -fpic + LDFLAGS += -Wl,-rpath-link,$(ACE_ROOT)/lib endif SOFLAGS += -shared LDFLAGS += -non-static |