summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Mitz <mitza@ociweb.com>2015-05-22 17:58:17 -0500
committerAdam Mitz <mitza@ociweb.com>2015-05-22 17:58:17 -0500
commit1a9551dd3f1b49ab90bebc6d28aceb698e96ad9c (patch)
tree9732deb46b5ef5a46e59141ba01aba53474f932c
parent49279311637960ce259ab32e2fc03775fdb5c161 (diff)
downloadATCD-1a9551dd3f1b49ab90bebc6d28aceb698e96ad9c.tar.gz
Add -non-static when linking an RTP with shared libs.
-rw-r--r--ACE/include/makeinclude/platform_vxworks7.0.GNU2
1 files changed, 2 insertions, 0 deletions
diff --git a/ACE/include/makeinclude/platform_vxworks7.0.GNU b/ACE/include/makeinclude/platform_vxworks7.0.GNU
index 6d231944b6f..cfbff2082a3 100644
--- a/ACE/include/makeinclude/platform_vxworks7.0.GNU
+++ b/ACE/include/makeinclude/platform_vxworks7.0.GNU
@@ -113,3 +113,5 @@ SOFLAGS += $(C++_COMPILER) $(OPTION_SHARED_CODE) $(LD_SHARED_LIB) \
LDFLAGS := $(filter-out -X -N,$(LDFLAGS))
LDFLAGS += -L$(VSB_DIR)/usr/lib/common$(if $(filter library,$(PRJ_TYPE)),/PIC)
LIBS += -lstdc++
+
+LDFLAGS += $(if $(filter 1,$(shared_libs)),$(if $(filter 1,$(static_libs_only)),,$(LD_OPTION_DYNAMIC)))