From owner-cvs-src-old@FreeBSD.ORG Thu Feb 24 21:46:18 2011 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9773A1065674 for ; Thu, 24 Feb 2011 21:46:18 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8516E8FC0A for ; Thu, 24 Feb 2011 21:46:18 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id p1OLkIbU013609 for ; Thu, 24 Feb 2011 21:46:18 GMT (envelope-from dim@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p1OLkIa4013608 for cvs-src-old@freebsd.org; Thu, 24 Feb 2011 21:46:18 GMT (envelope-from dim@repoman.freebsd.org) Message-Id: <201102242146.p1OLkIa4013608@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to dim@repoman.freebsd.org using -f From: Dimitry Andric Date: Thu, 24 Feb 2011 21:45:58 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/contrib/llvm/tools/clang/lib/Driver Tools.cpp X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 21:46:18 -0000 dim 2011-02-24 21:45:58 UTC FreeBSD src repository Modified files: contrib/llvm/tools/clang/lib/Driver Tools.cpp Log: SVN rev 219011 on 2011-02-24 21:45:58Z by dim Recently, in upstream clang, a fix was done to add -L/usr/lib to the arguments passed to ld, when linking. This was to appease configure scripts in several ports, that grep for such a -L option in "${CC} -v" output, to determine the startup objects passed to ld. Note ld itself does not need to be told about /usr/lib, since it has this path builtin anyway. However, if clang is built as a bootstrap tool during buildworld, it should not use *anything* outside ${WORLDTMP} to include or link with. The upstream fix to add -L/usr/lib breaks this assumption, and can thus cause libraries from /usr/lib to be linked in during buildworld. This can result in buildworld dying during linking of zinject, where it picks up the wrong copy of libzpool.so, eventually leading to: /usr/obj/usr/src/tmp/lib/libthr.so.3: undefined reference to `_rtld_get_stack_prot' Fix this issue by not adding any hardcoded paths, but by looping through the run-time library path list, which is already correctly set for the bootstrap phase. Reported by: datastream.freecity@gmail.com Pointy hat to: dim Revision Changes Path 1.7 +9 -8 src/contrib/llvm/tools/clang/lib/Driver/Tools.cpp