diff options
| author | Adam Mitz <mitza@ociweb.com> | 2015-06-15 16:14:04 -0500 |
|---|---|---|
| committer | Adam Mitz <mitza@ociweb.com> | 2015-06-15 16:14:04 -0500 |
| commit | 380e05ec176c6adf52dabf358a80159893d1db1a (patch) | |
| tree | 5dfe52589b93dd457bc0cdfb21ddf3ae5318c085 | |
| parent | 4f176a53eb6d2fbe24bfc2b3fd7fa57fb47a128a (diff) | |
| download | ATCD-380e05ec176c6adf52dabf358a80159893d1db1a.tar.gz | |
Allow VxWorks kernel DKMs to be built in other directories.
| -rw-r--r-- | ACE/include/makeinclude/platform_vxworks7.0.GNU | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ACE/include/makeinclude/platform_vxworks7.0.GNU b/ACE/include/makeinclude/platform_vxworks7.0.GNU index ae486c3ad1f..9581a93c7d7 100644 --- a/ACE/include/makeinclude/platform_vxworks7.0.GNU +++ b/ACE/include/makeinclude/platform_vxworks7.0.GNU @@ -92,15 +92,16 @@ ifeq ($(rtp),0) DKM_LIBS = $(if $(findstring 1,$(static_libs)$(static_libs_only)),$(LDLIBS)) endif + IFILE = $(VDIR)$(notdir $(basename $(1))) define LINK.cc.override -$(LD) -r -nostdlib -Wl,-X $(LDFLAGS) -o $(VDIR)$(basename $@)_partial.o $(filter %.o,$^) $(DKM_LIBS) - $(NM) $(VDIR)$(basename $@)_partial.o | $(MUNCH) > $(VDIR)$(basename $@)_ctdt.c - $(COMPILE.cc) -o $(VDIR)$(basename $@)_ctdt.o $(VDIR)$(basename $@)_ctdt.c - $(LD) -r -nostdlib -Wl,-X $(LD_SCRIPT_DOWNLOAD) -o $@ $(VDIR)$(basename $@)_ctdt.o $(VDIR)$(basename $@)_partial.o +$(LD) -r -nostdlib -Wl,-X $(LDFLAGS) -o $(call IFILE,$@)_partial.o $(filter %.o,$^) $(DKM_LIBS) + $(NM) $(call IFILE,$@)_partial.o | $(MUNCH) > $(call IFILE,$@)_ctdt.c + $(COMPILE.cc) -o $(call IFILE,$@)_ctdt.o $(call IFILE,$@)_ctdt.c + $(LD) -r -nostdlib -Wl,-X $(LD_SCRIPT_DOWNLOAD) -o $@ $(call IFILE,$@)_ctdt.o $(call IFILE,$@)_partial.o endef SOLINK.cc.override = $(LINK.cc.override) - CLEANUP_OBJS += $(foreach x,_ctdt.c _ctdt.o _partial.o,$(addsuffix $(x),$(VDIR)$(basename $(if $(LIB_NAME),$(VLIB),$(VBIN))))) + CLEANUP_OBJS += $(foreach x,_ctdt.c _ctdt.o _partial.o,$(addsuffix $(x),$(VDIR)$(notdir $(basename $(if $(LIB_NAME),$(VLIB),$(VBIN)))))) endif ace_vx_mk_dir = $(if $(findstring 1,$(rtp)),$(WIND_USR_MK),$(WIND_KRNL_MK)) |