diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-03-08 19:07:06 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-03-08 19:07:06 +0000 |
| commit | 23592714049e3e25be18774861b64781ea8455fe (patch) | |
| tree | 647d027878544d13b8f71009f5c173e8904754c7 | |
| parent | a1259cf68fbfcfcfa1f5fd9d3f1e564eaca245f0 (diff) | |
| download | ATCD-23592714049e3e25be18774861b64781ea8455fe.tar.gz | |
Thu Mar 8 19:06:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_vxworks6.3.GNU | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 26eccac083c..e96f0967149 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Thu Mar 8 19:06:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/platform_vxworks6.3.GNU: + Only add dl to LDLIBS when building shared + Thu Mar 8 18:06:14 UTC 2007 Ossama Othman <ossama_othman at symantec dot com> * ace/Time_Value.cpp (operator *=): diff --git a/ACE/include/makeinclude/platform_vxworks6.3.GNU b/ACE/include/makeinclude/platform_vxworks6.3.GNU index dbb5ab7defa..a281017d8ef 100644 --- a/ACE/include/makeinclude/platform_vxworks6.3.GNU +++ b/ACE/include/makeinclude/platform_vxworks6.3.GNU @@ -189,7 +189,9 @@ ifeq ($(rtp),1) else LDFLAGS += -L$(WIND_USR)/lib/$(VX_CPU_FAMILY)/$(CPU)/common endif - LDLIBS += -ldl + ifeq ($(SHARED_LIBS), 1) + LDLIBS += -ldl + endif else include $(TGT_DIR)/h/make/defs.default include $(TGT_DIR)/h/make/defs.$(WIND_HOST_TYPE) |