Return-Path: Delivered-To: apmail-incubator-stdcxx-commits-archive@www.apache.org Received: (qmail 52192 invoked from network); 6 Sep 2007 23:44:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 6 Sep 2007 23:44:04 -0000 Received: (qmail 21018 invoked by uid 500); 6 Sep 2007 23:43:59 -0000 Delivered-To: apmail-incubator-stdcxx-commits-archive@incubator.apache.org Received: (qmail 20999 invoked by uid 500); 6 Sep 2007 23:43:59 -0000 Mailing-List: contact stdcxx-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: stdcxx-dev@incubator.apache.org Delivered-To: mailing list stdcxx-commits@incubator.apache.org Received: (qmail 20988 invoked by uid 99); 6 Sep 2007 23:43:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Sep 2007 16:43:59 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Sep 2007 23:45:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B57E81A9832; Thu, 6 Sep 2007 16:43:31 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r573411 - in /incubator/stdcxx/trunk/etc/config: acc.config src/libc_decl.sh Date: Thu, 06 Sep 2007 23:43:31 -0000 To: stdcxx-commits@incubator.apache.org From: sebor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070906234331.B57E81A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sebor Date: Thu Sep 6 16:43:30 2007 New Revision: 573411 URL: http://svn.apache.org/viewvc?rev=573411&view=rev Log: 2007-09-06 Martin Sebor STDCXX-501 * acc.config (CXXFLAGS, CPPFLAGS, LDFLAGS): Used -AA and aCC's own C library headers by default regardless of platform (i.e., PA-RISC as well as IPF), unless -Aa is specified in _CXXOPTS. * libc_decl.sh (CXXFLAGS): Appended -I/usr/include only when -Aa is specified instead of based on the compiler version. Modified: incubator/stdcxx/trunk/etc/config/acc.config incubator/stdcxx/trunk/etc/config/src/libc_decl.sh Modified: incubator/stdcxx/trunk/etc/config/acc.config URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/acc.config?rev=573411&r1=573410&r2=573411&view=diff ============================================================================== --- incubator/stdcxx/trunk/etc/config/acc.config (original) +++ incubator/stdcxx/trunk/etc/config/acc.config Thu Sep 6 16:43:30 2007 @@ -4,7 +4,27 @@ # # configuration file for HP aCC on HP-UX # -############################################################################## +######################################################################## +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. See the License for the specific language governing +# permissions and limitations under the License. +# +# Copyright 1999-2007 Rogue Wave Software, Inc. +# +######################################################################## CXX = aCC @@ -72,13 +92,16 @@ # of the respective variables w/o underscores on HP-UX where the latter are # used directly by the compiler and linker, respectively -ifeq ($(shell [ $(aCC_MAJOR) -ge 5 ] && echo 1),1) -# use -AA with aCC 5 and 6 +# use -AA by default, allow -Aa as an option +use_Aa := $(filter -Aa,$(_CXXOPTS)) + +ifneq ($(use_Aa),-Aa) CXXFLAGS = -AA "$$"(_CXXOPTS) CXXPRELINK = CPPFLAGS = "$$"(_CPPOPTS) LDFLAGS = -AA +nostl -Wl,+s "$$"(_LDOPTS) else +# -Aa was specified in _CXXOPTS CXXFLAGS = -Aa +nostl "$$"(_CXXOPTS) CXXPRELINK = CPPFLAGS = -I$(TOPDIR)/include/ansi -I/usr/include "$$"(_CPPOPTS) Modified: incubator/stdcxx/trunk/etc/config/src/libc_decl.sh URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/src/libc_decl.sh?rev=573411&r1=573410&r2=573411&view=diff ============================================================================== --- incubator/stdcxx/trunk/etc/config/src/libc_decl.sh (original) +++ incubator/stdcxx/trunk/etc/config/src/libc_decl.sh Thu Sep 6 16:43:30 2007 @@ -20,7 +20,7 @@ # implied. See the License for the specific language governing # permissions and limitations under the License. # -# Copyright 2001-2006 Rogue Wave Software. +# Copyright 2001-2007 Rogue Wave Software, Inc. # ############################################################################## # @@ -82,9 +82,13 @@ if [ "$CXX" = "aCC" ] ; then cxx_major="`echo $CXX_VER | sed 's/.*\.\([0-9][0-9]*\)\..*/\1/'`" + echo $CXXFLAGS | grep '[-]Aa' >/dev/null 2>&1 + has_Aa=$? - if [ "$cxx_major" -le "05" ] ; then - # prepend -I/usr/include to CXXOPTS for HP aCC on PA but not IPF + if [ "$cxx_major" -le "05" -a $has_Aa -eq 0 ] ; then + # prepend -I/usr/include to CXXOPTS for HP aCC when the -Aa + # command line option is specified (aCC 3 and 5 but not aCC + # 6 on IPF) CXXFLAGS="$CXXFLAGS -I/usr/include" fi