diff options
| author | mcorino <mcorino@users.noreply.github.com> | 2006-11-07 13:33:43 +0000 |
|---|---|---|
| committer | mcorino <mcorino@users.noreply.github.com> | 2006-11-07 13:33:43 +0000 |
| commit | 968b18659582c76299bc10052205b2a4f9929731 (patch) | |
| tree | 8309a1e8d8d24bcf960053a7d1760791dc5ed3c3 | |
| parent | d5cfbda7a374db1ad028ac920adbe33a6da3f131 (diff) | |
| download | ATCD-968b18659582c76299bc10052205b2a4f9929731.tar.gz | |
ChangeLogTag: Tue Nov 07 13:31:10 UTC 2006 Martin Corino <mcorino@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_vxworks6.3.GNU | 14 |
2 files changed, 18 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 845f371a898..a1e1e612c2b 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Tue Nov 07 13:31:10 UTC 2006 Martin Corino <mcorino@remedy.nl> + + * include/makeinclude/platform_vxworks6.3.GNU: + + Fixed build settings for PPC32 builds with softfloat. + Tue Nov 7 10:38:25 UTC 2006 Simon McQueen <sm@prismtech.com> * tests/Naming_Test.cpp: diff --git a/ACE/include/makeinclude/platform_vxworks6.3.GNU b/ACE/include/makeinclude/platform_vxworks6.3.GNU index ec3b6ddc22c..05568999af5 100644 --- a/ACE/include/makeinclude/platform_vxworks6.3.GNU +++ b/ACE/include/makeinclude/platform_vxworks6.3.GNU @@ -80,7 +80,13 @@ ifeq ($(TOOL),) else override TOOL := $(TOOL) endif -override TOOL_FAMILY := $(TOOL) +ifeq ($(TOOL_FAMILY),) + ifeq ($(findstring gnu,$(TOOL)),gnu) + override TOOL_FAMILY := gnu + else + override TOOL_FAMILY := diab + endif +endif ifeq ("$(TOOL)","gnu") templates ?= automatic @@ -170,7 +176,11 @@ ifeq ($(rtp),1) LDFLAGS := $(filter-out -N, $(LDFLAGS)) LD := $(CPLUS) DLD := $(CPLUS) - LDFLAGS += -L$(WIND_USR)/lib/$(VX_CPU_FAMILY)/$(CPU)/common + ifeq ($(findstring *sf,*$(TOOL)),*sf) + LDFLAGS += -L$(WIND_USR)/lib/$(VX_CPU_FAMILY)/$(CPU)/sfcommon + else + LDFLAGS += -L$(WIND_USR)/lib/$(VX_CPU_FAMILY)/$(CPU)/common + endif LDLIBS += -ldl else include $(TGT_DIR)/h/make/defs.default |