diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-11-28 13:38:13 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-11-28 13:38:13 +0000 |
| commit | 7f62812cea5b21b22ea42dbab611ce1a8e17184a (patch) | |
| tree | 9c772b6efb5bb627ef7402a3ff84265a808379ba | |
| parent | f61ad1f3d5fd0fe744a1235ae51b969ff9860f1a (diff) | |
| download | ATCD-7f62812cea5b21b22ea42dbab611ce1a8e17184a.tar.gz | |
Wed Nov 28 13:37:54 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_vxworks6.3.GNU | 11 |
2 files changed, 13 insertions, 3 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 3c8fcec45e6..cc6c3101a1c 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Wed Nov 28 13:37:54 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/platform_vxworks6.3.GNU: + Only use pic when building rtp + Wed Nov 28 13:27:54 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * ace/OS_NS_unistd.inl: diff --git a/ACE/include/makeinclude/platform_vxworks6.3.GNU b/ACE/include/makeinclude/platform_vxworks6.3.GNU index 103917ff5f9..f7330b7b0cb 100644 --- a/ACE/include/makeinclude/platform_vxworks6.3.GNU +++ b/ACE/include/makeinclude/platform_vxworks6.3.GNU @@ -216,11 +216,16 @@ endif ifeq ($(SHARED_LIBS), 1) ifeq ("$(TOOL_FAMILY)","gnu") - PIC = -fpic - SOFLAGS += -fpic -shared + ifeq ($(rtp),1) + PIC = -fpic + SOFLAGS += -fpic + endif + SOFLAGS += -shared LDFLAGS += -non-static else - PIC = -Xpic + ifeq ($(rtp),1) + PIC = -Xpic + endif SOFLAGS += -Xshared LDFLAGS += -Xdynamic endif |