From owner-svn-src-all@FreeBSD.ORG Sun May 11 22:08:09 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4F3455BD for ; Sun, 11 May 2014 22:08:09 +0000 (UTC) Received: from mail-ig0-f176.google.com (mail-ig0-f176.google.com [209.85.213.176]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 18F382A37 for ; Sun, 11 May 2014 22:08:08 +0000 (UTC) Received: by mail-ig0-f176.google.com with SMTP id hl10so3092595igb.15 for ; Sun, 11 May 2014 15:08:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:content-type:mime-version:subject:from :in-reply-to:date:cc:content-transfer-encoding:message-id:references :to; bh=O/jDoF5KgscGRQ+YpdzWrc9+yY9x6OC58JZIkAYqGYQ=; b=NvRtqdsyNP9W7FGckgsb3geb9kRsnON7iAt8jr28kiie8qbRNFHeoNUYMI3cx8ydmN N9UEWYTZGL9W0MbXSJjW2OtorrqiYRrThiracU6VzbEurKe4VshF6IwVA8s7xDPiW3B/ q5arIyrBW/x9uroGQwjZsiJLA9ybxJ4gBeeLIAgRwOXHC9pwtBnuhQ3ApuMyS/3UJ3KA 6wZ/ynQs8MH643HFcPt7uY79dA8IRpeqwlRDrO9wcVWU3ZnhZG9YjlxWQxIVGOWrQmm9 342n0BJavJIO/pu1kvPNbeUWuHIt8mF6x7zE2ZHdR5HkcYm7/h/hqyHEvlDJwxiXOIm3 PX7Q== X-Gm-Message-State: ALoCoQmss1f0kObzX0CN0G1hUY9d9XTyawGRIIpU5Kq9LLjOKkQNV0GDaV2nzzPDD5EA6KB8jxGF X-Received: by 10.50.1.111 with SMTP id 15mr14895486igl.7.1399846087669; Sun, 11 May 2014 15:08:07 -0700 (PDT) Received: from netflix-mac.bsdimp.com (50-78-194-198-static.hfc.comcastbusiness.net. [50.78.194.198]) by mx.google.com with ESMTPSA id k8sm17124489ige.0.2014.05.11.15.08.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 11 May 2014 15:08:07 -0700 (PDT) Sender: Warner Losh X-Google-Original-From: Warner Losh Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 7.2 \(1874\)) Subject: Re: svn commit: r265895 - in head/gnu/lib: libstdc++ libsupc++ From: Warner Losh In-Reply-To: <201405112107.s4BL71LN090061@svn.freebsd.org> Date: Sun, 11 May 2014 16:08:06 -0600 Content-Transfer-Encoding: quoted-printable Message-Id: References: <201405112107.s4BL71LN090061@svn.freebsd.org> To: Dimitry Andric X-Mailer: Apple Mail (2.1874) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 May 2014 22:08:09 -0000 On May 11, 2014, at 3:07 PM, Dimitry Andric wrote: > Author: dim > Date: Sun May 11 21:07:00 2014 > New Revision: 265895 > URL: http://svnweb.freebsd.org/changeset/base/265895 >=20 > Log: > Allow libstdc++ and libsupc++ to compile with clang again, after the > bsd.*.mk infrastructure changes. Apparently, you must now modify > CXXFLAGS *before* including bsd.lib.mk, or your changes will be lost. You must modify CXXFLAGS before you finalize them with the :=3D = assignment is the real issue here. I broke this when I converted the .if to = CXXFLAGS.clang a couple of revisions back. Thanks for fixing it. > Modified: > head/gnu/lib/libstdc++/Makefile > head/gnu/lib/libsupc++/Makefile >=20 > Modified: head/gnu/lib/libstdc++/Makefile > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/gnu/lib/libstdc++/Makefile Sun May 11 20:44:58 2014 = (r265894) > +++ head/gnu/lib/libstdc++/Makefile Sun May 11 21:07:00 2014 = (r265895) > @@ -632,9 +632,9 @@ ${VERSION_MAP}: ${SRCDIR}/config/abi/pre >=20 > CLEANFILES+=3D ${VERSION_MAP} >=20 > +CXXFLAGS.clang+=3D -stdlib=3Dlibstdc++ > + > .include >=20 > # Filter out libc++-specific flags, and -std=3D flags above c++98 or = gnu++98. > CXXFLAGS:=3D = ${CXXFLAGS:N-stdlib=3Dlibc++:N-std=3Dc++[01][13x]:N-std=3Dgnu++[01][13x]} > - > -CXXFLAGS.clang+=3D -stdlib=3Dlibstdc++ >=20 > Modified: head/gnu/lib/libsupc++/Makefile > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/gnu/lib/libsupc++/Makefile Sun May 11 20:44:58 2014 = (r265894) > +++ head/gnu/lib/libsupc++/Makefile Sun May 11 21:07:00 2014 = (r265895) > @@ -51,10 +51,9 @@ CLEANFILES+=3D unwind.h >=20 > VERSION_MAP=3D ${.CURDIR}/Version.map >=20 > +CXXFLAGS.clang+=3D -stdlib=3Dlibstdc++ >=20 > .include >=20 > # Filter out libc++-specific flags, and -std=3D flags above c++98 or = gnu++98. > CXXFLAGS:=3D = ${CXXFLAGS:N-stdlib=3Dlibc++:N-std=3Dc++[01][13x]:N-std=3Dgnu++[01][13x]} > - > -CXXFLAGS.clang+=3D -stdlib=3Dlibstdc++ >=20