diff options
| author | Adam Mitz <mitza@ociweb.com> | 2017-01-09 16:49:56 -0600 |
|---|---|---|
| committer | Adam Mitz <mitza@ociweb.com> | 2017-01-09 16:49:56 -0600 |
| commit | a55bc9658df5e1bb763c8ff2f4d39d5921770701 (patch) | |
| tree | 86c12ed48f2753f3d502aa129d68b8506c0ce0ee /ACE/include | |
| parent | 8ee074292a1884a0b5d43e9ecd7c7e69b0975dd2 (diff) | |
| download | ATCD-a55bc9658df5e1bb763c8ff2f4d39d5921770701.tar.gz | |
Updates for VxWorks 7 December 2016 release
Diffstat (limited to 'ACE/include')
| -rw-r--r-- | ACE/include/makeinclude/platform_vxworks.GNU | 2 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_vxworks7.0.GNU | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ACE/include/makeinclude/platform_vxworks.GNU b/ACE/include/makeinclude/platform_vxworks.GNU index 9e09aa9aa3b..ffdcd18d159 100644 --- a/ACE/include/makeinclude/platform_vxworks.GNU +++ b/ACE/include/makeinclude/platform_vxworks.GNU @@ -30,6 +30,6 @@ endif ifeq (vxworks-6.9, $(findstring vxworks-6.9,$(WIND_PLATFORM))) include $(ACE_ROOT)/include/makeinclude/platform_vxworks6.9.GNU endif -ifeq (vxworks-7.0, $(findstring vxworks-7.0,$(WIND_PLATFORM))) +ifeq (vxworks-7, $(findstring vxworks-7,$(WIND_PLATFORM))) include $(ACE_ROOT)/include/makeinclude/platform_vxworks7.0.GNU endif diff --git a/ACE/include/makeinclude/platform_vxworks7.0.GNU b/ACE/include/makeinclude/platform_vxworks7.0.GNU index 41909ee772a..d5fbc37b076 100644 --- a/ACE/include/makeinclude/platform_vxworks7.0.GNU +++ b/ACE/include/makeinclude/platform_vxworks7.0.GNU @@ -139,4 +139,4 @@ endif LIBS += -lstdc++ build_nonstatic = $(if $(findstring 1,$(shared_libs)$(shared_libs_only)),$(if $(filter 1,$(static_libs_only)),,1)) -LDFLAGS += $(if $(build_nonstatic),$(LD_OPTION_DYNAMIC),-static) +LDFLAGS += $(if $(build_nonstatic),$(LD_OPTION_DYNAMIC) -non-static,-static) |