From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Daniel Colascione Newsgroups: gmane.emacs.devel Subject: [PATCH] OS X: make configure work better out of the box with FSF GCC Date: Sat, 26 Feb 2011 21:05:50 -0800 Message-ID: <4D69DBAE.5070401@gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig6BFB817124A0E1BFBF4A9254" X-Trace: dough.gmane.org 1298783174 11542 80.91.229.12 (27 Feb 2011 05:06:14 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 27 Feb 2011 05:06:14 +0000 (UTC) To: Emacs development discussions Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Feb 27 06:06:10 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PtYpd-0007sf-3m for ged-emacs-devel@m.gmane.org; Sun, 27 Feb 2011 06:06:09 +0100 Original-Received: from localhost ([127.0.0.1]:35020 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PtYpc-0003zI-Dg for ged-emacs-devel@m.gmane.org; Sun, 27 Feb 2011 00:06:08 -0500 Original-Received: from [140.186.70.92] (port=55947 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PtYpR-0003wi-RD for emacs-devel@gnu.org; Sun, 27 Feb 2011 00:05:58 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PtYpQ-0007MV-Fi for emacs-devel@gnu.org; Sun, 27 Feb 2011 00:05:57 -0500 Original-Received: from mail-iw0-f169.google.com ([209.85.214.169]:59626) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PtYpQ-0007MP-9t for emacs-devel@gnu.org; Sun, 27 Feb 2011 00:05:56 -0500 Original-Received: by iwl42 with SMTP id 42so2853424iwl.0 for ; Sat, 26 Feb 2011 21:05:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:message-id:date:from:user-agent:mime-version:to :subject:x-enigmail-version:content-type; bh=DA21pd6wxtKTpMDB27+vl4SdTV65wB5haVntEd4ghRo=; b=eA2ljtMdjob48Dfw6RWsZ/z7KOCdC3dcVzwftUEaR51jVgwl0eaIunGHvZgjrigJdK pXwv0ndsNZldUL0mcy2eoY8bzrG5FORDH8PYIWnl42k3jWNAMbq2GipnGWdZgR8LbxI6 JgqNkHpbirsNtaZYE7Zqbj4ZjlMsEasG/EIIE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject :x-enigmail-version:content-type; b=mMSdvu8ZmoACNsuiMguszYRwlz88IFyOshiQ67wLTYbOK0phWB3D+UWb6/gHnLmQxh 3Z6St4xx0JIxZvhhESbzEVHMV2rSd3JNsHJeqazX4ODC1omdVhSgfDzKymhn7q2rcbH3 iuZLwNKj40z9rxPjfeGdCdRgigLy2f4qrBPWY= Original-Received: by 10.42.230.65 with SMTP id jl1mr3090398icb.411.1298783155135; Sat, 26 Feb 2011 21:05:55 -0800 (PST) Original-Received: from edith.local (c-67-183-23-114.hsd1.wa.comcast.net [67.183.23.114]) by mx.google.com with ESMTPS id g4sm1921607ick.11.2011.02.26.21.05.53 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 26 Feb 2011 21:05:54 -0800 (PST) User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2.13) Gecko/20101207 Thunderbird/3.1.7 X-Enigmail-Version: 1.1.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.214.169 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:136571 Archived-At: This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig6BFB817124A0E1BFBF4A9254 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable I didn't include the corresponding configure changes; I figure I can let whoever installs this patch regenerate the script. =3D=3D modified file 'configure.in' --- configure.in 2011-02-27 04:33:43 +0000 +++ configure.in 2011-02-27 05:02:27 +0000 @@ -481,8 +481,21 @@ * ) unported=3Dyes ;; esac opsys=3Ddarwin - # Define CPP as follows to make autoconf work correctly. - CPP=3D"${CC-cc} -E -no-cpp-precomp" +=09 + # Define CPP as follows to make autoconf work correctly + # when using the system compiler. + case "$(which "${CC-cc}")" in + /usr/bin/* | /usr/lib/* ) + CPP=3D"${CC-cc} -E -no-cpp-precomp" + ;; + * ) + # The below macro prevents the Carbon headers from defining + # nonstandard constructs not understood by FSF GCC. + CPPFLAGS=3D"$CPPFLAGS -D__INTEL_COMPILER=3D1" + CPP=3D"${CC-cc} -E -D__INTEL_COMPILER=3D1" + ;; + esac; + # Use fink packages if available. if test -d /sw/include && test -d /sw/lib; then GCC_TEST_OPTIONS=3D"-I/sw/include -L/sw/lib" @@ -614,9 +627,7 @@ machine=3Dintel386 case "${canonical}" in *-cygwin ) opsys=3Dcygwin ;; - *-darwin* ) opsys=3Ddarwin - CPP=3D"${CC-cc} -E -no-cpp-precomp" - ;; + *-darwin* ) opsys=3Ddarwin ;; *-linux-gnu* ) opsys=3Dgnu-linux ;; *-sysv4.2uw* ) opsys=3Dunixware; NON_GNU_CPP=3D/lib/cpp ;; *-sysv5uw* ) opsys=3Dunixware; NON_GNU_CPP=3D/lib/cpp ;; --------------enig6BFB817124A0E1BFBF4A9254 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (Darwin) iEYEARECAAYFAk1p27AACgkQ17c2LVA10VtG1ACfTAktj/rt8mnf+BF8iDk5NfKE 6wkAoMV5/Cy0vMJVFpg24ufMhKGtRejX =lH1y -----END PGP SIGNATURE----- --------------enig6BFB817124A0E1BFBF4A9254--