diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-04-01 08:34:02 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-04-01 08:34:02 +0000 |
| commit | 16a9140573565c9f17230fcdb04b0e474373070c (patch) | |
| tree | ee02b052f4391745a1b5797df7c5650de288bd81 | |
| parent | 0592a5fb5493b2d080bbf4f6f59e2c81b7bccea4 (diff) | |
| download | ATCD-16a9140573565c9f17230fcdb04b0e474373070c.tar.gz | |
Tue Apr 1 08:33:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 8 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_openvms.GNU | 1 | ||||
| -rw-r--r-- | ACE/include/makeinclude/rules.lib.GNU | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 1f7094d0411..f383594e3a2 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,11 @@ +Tue Apr 1 08:33:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/platform_openvms.GNU: + Set ACE_OPENVMS_IA64 on Itanium + + * include/makeinclude/rules.lib.GNU: + Only use a special AR rule on OpenVMS IA64 + Tue Apr 1 07:38:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Intrusive_Auto_Ptr_Test.cpp: diff --git a/ACE/include/makeinclude/platform_openvms.GNU b/ACE/include/makeinclude/platform_openvms.GNU index 9884a3d88f1..cfb1ca3da88 100644 --- a/ACE/include/makeinclude/platform_openvms.GNU +++ b/ACE/include/makeinclude/platform_openvms.GNU @@ -32,6 +32,7 @@ ifeq ($(buildbits),64) endif ifeq ($(HOSTTYPE),ia64) + ACE_OPENVMS_IA64 = 1 SYMVEC_OPT_FILE ?= $(LIB_NAME)_symvec.opt ifeq ($(PRJ_TYPE),library) ifeq ($(shared_libs),1) diff --git a/ACE/include/makeinclude/rules.lib.GNU b/ACE/include/makeinclude/rules.lib.GNU index 244dec5ee35..f894996b496 100644 --- a/ACE/include/makeinclude/rules.lib.GNU +++ b/ACE/include/makeinclude/rules.lib.GNU @@ -156,7 +156,7 @@ $(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)) + ifeq (1,$(ACE_OPENVMS_IA64)) $(AR) $(ARFLAGS) $@ $(AREXTRA) $(filter %.o, $?) else ([ "`echo $(TMPINCDIR:%=%/*.o)`" != "$(TMPINCDIR:%=%/*.o)" ] && echo $(TMPINCDIR:%=%/*.o); \ |