summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ACE/NEWS3
-rw-r--r--ACE/include/makeinclude/rules.lib.GNU28
2 files changed, 18 insertions, 13 deletions
diff --git a/ACE/NEWS b/ACE/NEWS
index e687a5fd445..a0505bbab15 100644
--- a/ACE/NEWS
+++ b/ACE/NEWS
@@ -8,6 +8,9 @@ USER VISIBLE CHANGES BETWEEN ACE-6.3.2 and ACE-6.3.3
. As part of the release script we now generate vc12 and vc14
solution files which are packaged as part of the release
+. Added support for VxWorks 7 (kernel mode and RTP).
+ See the comments in include/makeinclude/platform_vxworks7.0.GNU for details.
+
USER VISIBLE CHANGES BETWEEN ACE-6.3.1 and ACE-6.3.2
====================================================
diff --git a/ACE/include/makeinclude/rules.lib.GNU b/ACE/include/makeinclude/rules.lib.GNU
index eb5c50946f7..94868ff0d87 100644
--- a/ACE/include/makeinclude/rules.lib.GNU
+++ b/ACE/include/makeinclude/rules.lib.GNU
@@ -119,20 +119,22 @@ ifdef ARCH
ARCHDIR = $(ARCH)/
endif
-ifdef static_libs
- LIB_INSTALL += $(VLIB:$(ARCHDIR)%=$(INSLIB)/%)
- CLEANUP_INSTALL += $(CLEANUP_VLIB:$(ARCHDIR)%=$(INSLIB)/%)
-endif # static_libs
+ifneq ($(INSLIB),)
+ ifdef static_libs
+ LIB_INSTALL += $(VLIB:$(ARCHDIR)%=$(INSLIB)/%)
+ CLEANUP_INSTALL += $(CLEANUP_VLIB:$(ARCHDIR)%=$(INSLIB)/%)
+ endif # static_libs
-ifdef shared_libs
- LIB_INSTALL += $(VSHLIB:$(ARCHDIR)%=$(INSLIB)/%)
- CLEANUP_INSTALL += $(CLEANUP_VSHLIB:$(ARCHDIR)%=$(INSLIB)/%)
- CLEANUP_INSTALL += $(CLEANUP_VSHLIB_NO_VER:$(ARCHDIR)%=$(INSLIB)/%*)
- ifdef SHLIBA
- LIB_INSTALL += $(VSHLIBA:$(ARCHDIR)%=$(INSLIB)/%)
- CLEANUP_INSTALL += $(CLEANUP_SHLIBA:$(ARCHDIR)%=$(INSLIB)/%)
- endif
-endif # shared_libs
+ ifdef shared_libs
+ LIB_INSTALL += $(VSHLIB:$(ARCHDIR)%=$(INSLIB)/%)
+ CLEANUP_INSTALL += $(CLEANUP_VSHLIB:$(ARCHDIR)%=$(INSLIB)/%)
+ CLEANUP_INSTALL += $(CLEANUP_VSHLIB_NO_VER:$(ARCHDIR)%=$(INSLIB)/%*)
+ ifdef SHLIBA
+ LIB_INSTALL += $(VSHLIBA:$(ARCHDIR)%=$(INSLIB)/%)
+ CLEANUP_INSTALL += $(CLEANUP_SHLIBA:$(ARCHDIR)%=$(INSLIB)/%)
+ endif
+ endif # shared_libs
+endif # INSLIB
ace_lib_prelink ?= 0
aix_build ?= 0