diff options
| author | Adam Mitz <mitza-oci@users.noreply.github.com> | 2010-08-09 16:04:31 +0000 |
|---|---|---|
| committer | Adam Mitz <mitza-oci@users.noreply.github.com> | 2010-08-09 16:04:31 +0000 |
| commit | 58086dc36b0f8aadc95573b1377723d8bcb01c3b (patch) | |
| tree | dca3fa0dce664a52f06491f3aa9e8218ba633231 | |
| parent | 9d47eca31ca4b5093f6e6ff33de8d41c2fb2f2bd (diff) | |
| download | ATCD-58086dc36b0f8aadc95573b1377723d8bcb01c3b.tar.gz | |
ChangeLogTag: Mon Aug 9 16:02:08 UTC 2010 Adam Mitz <mitza@ociweb.com>
| -rw-r--r-- | ACE/ChangeLog | 7 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_vxworks6.3.GNU | 5 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_vxworks6.8.GNU | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 11e3af2792f..6da98265e8c 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Mon Aug 9 16:02:08 UTC 2010 Adam Mitz <mitza@ociweb.com> + + * include/makeinclude/platform_vxworks6.3.GNU: + * include/makeinclude/platform_vxworks6.8.GNU: + + The location of user-mode (RTP) libraries has changed in 6.8. + Mon Aug 9 15:14:43 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> * ACEXML/apps/svcconf/Svcconf_Handler.cpp: diff --git a/ACE/include/makeinclude/platform_vxworks6.3.GNU b/ACE/include/makeinclude/platform_vxworks6.3.GNU index 069a68975c2..902c1a875e0 100644 --- a/ACE/include/makeinclude/platform_vxworks6.3.GNU +++ b/ACE/include/makeinclude/platform_vxworks6.3.GNU @@ -203,10 +203,11 @@ ifeq ($(rtp),1) LDFLAGS := $(filter-out -N, $(LDFLAGS)) LD := $(CPLUS) DLD := $(CPLUS) + WIND_USR_LIB ?= lib ifeq ($(findstring *sf,*$(TOOL)),*sf) - LDFLAGS += -L$(WIND_USR)/lib/$(VX_CPU_FAMILY)/$(CPU)/sfcommon$(PICDIR) + LDFLAGS += -L$(WIND_USR)/$(WIND_USR_LIB)/$(VX_CPU_FAMILY)/$(CPU)/sfcommon$(PICDIR) else - LDFLAGS += -L$(WIND_USR)/lib/$(VX_CPU_FAMILY)/$(CPU)/common$(PICDIR) + LDFLAGS += -L$(WIND_USR)/$(WIND_USR_LIB)/$(VX_CPU_FAMILY)/$(CPU)/common$(PICDIR) endif else include $(TGT_DIR)/h/make/defs.default diff --git a/ACE/include/makeinclude/platform_vxworks6.8.GNU b/ACE/include/makeinclude/platform_vxworks6.8.GNU index c671c58a4a0..e0aa8bb0cb7 100644 --- a/ACE/include/makeinclude/platform_vxworks6.8.GNU +++ b/ACE/include/makeinclude/platform_vxworks6.8.GNU @@ -5,5 +5,7 @@ ifeq ($(VXWORKS_VERSION_FLAG),) VXWORKS_VERSION_FLAG = -DACE_VXWORKS=0x680 endif # VXWORKS_VERSION_FLAG +WIND_USR_LIB = ../lib/usr/lib + include $(ACE_ROOT)/include/makeinclude/platform_vxworks6.7.GNU |