diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-05-15 10:19:37 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-05-15 10:19:37 +0000 |
| commit | 870a926d3bb43b6639fea540530aebdd881e36f3 (patch) | |
| tree | 9318c8ddebba8547aba7df16acb12539b2d3496a | |
| parent | a7da4e4ba39688f35c597401fc61104084a75f32 (diff) | |
| download | ATCD-870a926d3bb43b6639fea540530aebdd881e36f3.tar.gz | |
Thu May 15 10:19:15 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/include/makeinclude/rules.lib.GNU | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index a5991542ebf..72bed990852 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Thu May 15 10:19:15 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/rules.lib.GNU: + Fixed OpenVMS specific part + Thu May 15 10:17:15 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * ace/Unbounded_Set_Ex.cpp: diff --git a/ACE/include/makeinclude/rules.lib.GNU b/ACE/include/makeinclude/rules.lib.GNU index f894996b496..2eeb0633f14 100644 --- a/ACE/include/makeinclude/rules.lib.GNU +++ b/ACE/include/makeinclude/rules.lib.GNU @@ -156,8 +156,8 @@ $(VLIB): $(VLOBJS) #### to lib files, for example. -$(LINK.cc) $(LINK_OUTPUT_FLAG) ace-templ_inst $? $(LDFLAGS) $(ACE_NUL_STDERR) endif # ace_lib_prelink - ifeq (1,$(ACE_OPENVMS_IA64)) - $(AR) $(ARFLAGS) $@ $(AREXTRA) $(filter %.o, $?) + ifeq (1,$(ACE_OPENVMS)) + find $(TMPINCDIR:%=%) -name "*.o" -or -name "*.obj" | xargs $(AR) $(ARFLAGS) $@ $(AREXTRA) else ([ "`echo $(TMPINCDIR:%=%/*.o)`" != "$(TMPINCDIR:%=%/*.o)" ] && echo $(TMPINCDIR:%=%/*.o); \ echo $(filter %.o, $?)) | xargs $(AR) $(ARFLAGS) $@ $(AREXTRA) |