diff options
| author | Adam Mitz <mitza@ociweb.com> | 2015-06-16 12:28:20 -0500 |
|---|---|---|
| committer | Adam Mitz <mitza@ociweb.com> | 2015-06-16 12:28:20 -0500 |
| commit | 78cc1a6348d9e7041dd4179796cc2bcbc56d311b (patch) | |
| tree | 51a2b7ae533f8795660e5d3a6be4574a66e47add | |
| parent | 380e05ec176c6adf52dabf358a80159893d1db1a (diff) | |
| download | ATCD-78cc1a6348d9e7041dd4179796cc2bcbc56d311b.tar.gz | |
Use -static when linking VxWorks 7 static RTPs.
This allows the same lib dir to have libFoo.a and libFoo.so, and the linker
will select libFoo.a due to -static.
| -rw-r--r-- | ACE/include/makeinclude/platform_vxworks7.0.GNU | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ACE/include/makeinclude/platform_vxworks7.0.GNU b/ACE/include/makeinclude/platform_vxworks7.0.GNU index 9581a93c7d7..e9ec1ee6ec5 100644 --- a/ACE/include/makeinclude/platform_vxworks7.0.GNU +++ b/ACE/include/makeinclude/platform_vxworks7.0.GNU @@ -137,5 +137,5 @@ ifeq ($(rtp),1) endif LIBS += -lstdc++ -LDFLAGS += $(if $(filter 1,$(shared_libs)),$(if $(filter 1,$(static_libs_only)),,$(LD_OPTION_DYNAMIC))) - +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) |