diff options
Diffstat (limited to 'ACE/include/makeinclude/platform_vxworks5.5.x.GNU')
| -rw-r--r-- | ACE/include/makeinclude/platform_vxworks5.5.x.GNU | 50 |
1 files changed, 20 insertions, 30 deletions
diff --git a/ACE/include/makeinclude/platform_vxworks5.5.x.GNU b/ACE/include/makeinclude/platform_vxworks5.5.x.GNU index c73e42594b1..df071f82675 100644 --- a/ACE/include/makeinclude/platform_vxworks5.5.x.GNU +++ b/ACE/include/makeinclude/platform_vxworks5.5.x.GNU @@ -161,25 +161,15 @@ ifeq ("$(VXWORKSLINK)","true") ifeq ($(SHARED_LIBS),1) ##LD_PARTIAL += -L$(ACE_ROOT)/lib -L./ $(LDLIBPATH) $(LD_LINK_PATH) PRJ_OBJS_FOR_LD_PARTIAL=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) - ifeq ($(VX_SO_BUILD),1) + ifeq ($(VX_SO_BUILD),1) ## Shared lib builds for VxWorks will also build 'import' libraries - LIB_INSTALL += $(VLIB:%=$(INSLIB)/%) - CLEANUP_INSTALL += $(CLEANUP_VLIB:%=$(INSLIB)/%) + LIB_INSTALL += $(VLIB:%=$(INSLIB)/%) + CLEANUP_INSTALL += $(CLEANUP_VLIB:%=$(INSLIB)/%) REALCLEAN_FILES += $(CLEANUP_LIB:%=%) $(CLEANUP_LIB:%=%_debug) $(CLEANUP_LIB:%=%_profile) $(CLEANUP_LIB:%=%_optimize) - endif + endif else LD_PARTIAL += -L$(ACE_ROOT)/ace -L./ $(LDLIBPATH) $(LD_LINK_PATH) - ifeq (1,$(repo)) - PRJ_OBJS_FOR_LD_PARTIAL=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) $(shell set AR=$(AR) && set RANLIB=$(RANLIB) && perl $(ACE_ROOT)/bin/vx_repo_link.pl $(VLDLIBS)) $(ACE_SHLIBS) - ifneq (1,$(VX_KEEP_PRELINK_LIB)) - POSTLINK = rmdir /s/q .lib && rmdir /s/q $(subst /,\,$(VDIR)) - REALCLEAN_FILES += .lib - else - POSTLINK = rmdir /s/q $(subst /,\,$(VDIR)) - endif - else - PRJ_OBJS_FOR_LD_PARTIAL=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) $(VLDLIBS) $(ACE_SHLIBS) - endif + PRJ_OBJS_FOR_LD_PARTIAL=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) $(VLDLIBS) $(ACE_SHLIBS) $(LIBS) endif PRJ_OBJS_FOR_LD=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) PRJ_OBJS_FOR_NM=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) @@ -208,22 +198,22 @@ ifeq ("$(TOOL)","gnu") include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU ifeq ("$(templates)","automatic") - ifdef repo - ifeq ("$(VXWORKSLINK)","true") - ifeq ($(VX_APP_BUILD),1) - ifneq ($(SHARED_LIBS),1) - LD_PARTIAL += -frepo - endif - endif - else - #ace_lib_prelink := 1 - LINK.cc = override - LINK.cc.override = $(LD_PARTIAL) -frepo - LDFLAGS = $(ACE_SHLIBS) - endif - else - C++FLAGS += -fmerge-templates +ifdef repo +ifeq ("$(VXWORKSLINK)","true") + ifeq ($(VX_APP_BUILD),1) + ifneq ($(SHARED_LIBS),1) + LD_PARTIAL += -frepo endif + endif +else + ace_lib_prelink := 1 + LINK.cc = override + LINK.cc.override = $(LD_PARTIAL) -frepo -L$(ACE_ROOT)/ace -L$(INSLIB) -L./ $(LDLIBPATH) $(LD_LINK_PATH) + LDFLAGS = $(ACE_SHLIBS) +endif +else + C++FLAGS += -fmerge-templates +endif endif # TEMPLATES_FLAG is set by platform_g++_common.GNU |