summaryrefslogtreecommitdiff
path: root/ACE/include/makeinclude/rules.lib.GNU
diff options
context:
space:
mode:
authorelliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2009-08-04 17:10:31 +0000
committerelliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2009-08-04 17:10:31 +0000
commitfce69105fddf4cec0a5e03c3cec31c401a8fbfb7 (patch)
treefaf24ddda1d51579a915aa201bd467772f72860d /ACE/include/makeinclude/rules.lib.GNU
parentd6f8197c1fddb7c0d782c8e600acb40d9d6c9551 (diff)
downloadATCD-fce69105fddf4cec0a5e03c3cec31c401a8fbfb7.tar.gz
ChangeLogTag: Tue Aug 4 17:09:00 UTC 2009 Chad Elliott <elliott_c@ociweb.com>
Diffstat (limited to 'ACE/include/makeinclude/rules.lib.GNU')
-rw-r--r--ACE/include/makeinclude/rules.lib.GNU10
1 files changed, 3 insertions, 7 deletions
diff --git a/ACE/include/makeinclude/rules.lib.GNU b/ACE/include/makeinclude/rules.lib.GNU
index ac55167e7f9..1c3a0fe42f5 100644
--- a/ACE/include/makeinclude/rules.lib.GNU
+++ b/ACE/include/makeinclude/rules.lib.GNU
@@ -236,15 +236,11 @@ $(VSHLIB): $(VSHOBJS)
#### to lib files, for example.
-$(LINK.cc) $(LINK_OUTPUT_FLAG) ace-templ_inst $^ $(LDFLAGS) $(ACE_NUL_STDERR)
endif # ace_lib_prelink
- ifeq ($(split),1)
- $(SHR_FILTER) $(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ $(VSHDIR)/*.$(OBJEXT) $(LDFLAGS) $(ACE_SHLIBS) $(LIBS)
- else # ! split
- ifneq ($(SOLINK.cc.override),)
+ ifneq ($(SOLINK.cc.override),)
$(SOLINK.cc.override)
- else
+ else
$(SHR_FILTER) $(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ $^ $(LDFLAGS) $(ACE_SHLIBS) $(LIBS)
- endif #override
- endif # split
+ endif #override
endif # ibmcxx_build
endif # SHLIBBUILD
endif # aix_build