From fa14f5cf6dd9b5e255837ceaa8adfd4ff2a7268b Mon Sep 17 00:00:00 2001 From: mcorino Date: Wed, 1 Dec 2004 08:49:52 +0000 Subject: ChangeLogTag: Wed Dec 1 08:49:12 UTC 2004 Martin Corino --- ChangeLog | 7 ++++++- include/makeinclude/platform_vxworks5.5.x.GNU | 7 +++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 509c5258837..06abe6fc465 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Dec 1 08:49:12 UTC 2004 Martin Corino + + * include/makeinclude/platform_vxworks5.5.x.GNU: + Fixed linking issues concerning ACE/TAO libraries. + Tue Nov 30 16:38:08 2004 J.T. Conklin * apps/gperf/tests/Makefile.am: @@ -5,7 +10,7 @@ Tue Nov 30 16:38:08 2004 J.T. Conklin Changed to only generate idl.cpp from idl.gperf once. The attempt to generate it twice, the a second time in a different directory failed because the "stamp" file was the same. - + Tue Nov 30 17:32:29 2004 Steve Huston * m4/ace.m4: Added two new options, --enable-pthreads and diff --git a/include/makeinclude/platform_vxworks5.5.x.GNU b/include/makeinclude/platform_vxworks5.5.x.GNU index 8b3741b82d0..9e83e3d808b 100644 --- a/include/makeinclude/platform_vxworks5.5.x.GNU +++ b/include/makeinclude/platform_vxworks5.5.x.GNU @@ -121,8 +121,9 @@ include $(TGT_DIR)/h/tool/$(TOOL_FAMILY)/make.$(CPU)$(TOOL) ifeq ("$(VXWORKSLINK)","true") override LARGE_PROJECT = PRJ_OBJS = $(addprefix $(VDIR), $(OBJS)) - LD_PARTIAL += -L$(ACE_ROOT)/ace -L./ $(LDLIBPATH) $(LD_LINK_PATH) $(VLDLIBS) - PRJ_OBJS_FOR_LD_PARTIAL=$(addprefix $(VDIR), $(OBJS)) + LD_PARTIAL += -L$(ACE_ROOT)/ace -L./ $(LDLIBPATH) $(LD_LINK_PATH) +## LD_PARTIAL_LAST_FLAGS += $(OPTION_PASS_TO_LD)--split-by-reloc + PRJ_OBJS_FOR_LD_PARTIAL=$(addprefix $(VDIR), $(OBJS)) $(VLDLIBS) PRJ_OBJS_FOR_LD=$(addprefix $(VDIR), $(OBJS)) PRJ_OBJS_FOR_NM=$(addprefix $(VDIR), $(OBJS)) PRJ_OBJS_FOR_AR=$(addprefix $(VDIR), $(OBJS)) @@ -134,8 +135,6 @@ ifeq ("$(VXWORKSLINK)","true") ## default: all -##include $(TGT_DIR)/h/make/rules.$(PRJ_TYPE) - ## dummy target to satify VxWorks dependencies $(PRJ_DIR)/$(PRJ_FILE): @echo 1>$@ -- cgit v1.2.1