svn commit: r277803 - projects/clang360-import/lib/clang/include

[Dimitry Andric]

On 27 Jan 2015, at 20:42, Dimitry Andric <dim at FreeBSD.org> wrote:
> 
> On 27 Jan 2015, at 20:34, Benjamin Kaduk <bjkfbsd at gmail.com> wrote:
>> 
>> On Tue, Jan 27, 2015 at 2:25 PM, Dimitry Andric <dim at freebsd.org> wrote:
>> Author: dim
>> Date: Tue Jan 27 19:25:39 2015
>> New Revision: 277803
>> URL: https://svnweb.freebsd.org/changeset/base/277803
>> 
>> Log:
>>  Change the path to clang's private headers.  Upstream has always stored
>>  these in $LIBDIR/clang/$VERSION/include, instead of our previous custom
>>  location in /usr/include/clang/$VERSION.  This allows us to drop yet
>>  another FreeBSD-specific patch.
>> 
>> Modified:
>>  projects/clang360-import/lib/clang/include/Makefile
>> 
>> Modified: projects/clang360-import/lib/clang/include/Makefile
>> ==============================================================================
>> --- projects/clang360-import/lib/clang/include/Makefile Tue Jan 27 18:58:24 2015        (r277802)
>> +++ projects/clang360-import/lib/clang/include/Makefile Tue Jan 27 19:25:39 2015        (r277803)
>> @@ -8,7 +8,7 @@ LLVM_SRCS= ${.CURDIR}/../../../contrib/l
>> 
>> .PATH: ${LLVM_SRCS}/tools/clang/lib/Headers
>> 
>> -INCSDIR=${INCLUDEDIR}/clang/3.6.0
>> +INCSDIR=/usr/lib/clang/3.6.0/include
>> 
>> Is it a good idea to hardcode /usr/lib/ here?
> 
> I know of no other way to make sure that it does *not* get installed
> into /usr/lib32 during the install32 stage.  This was the same problem
> I encountered for lib/libclang_rt/Makefile.inc.
> 
> If you know a nicer way to ensure that, please let me know. :)

Of course, after I'd written that, I realized that the lib/clang subdir
is not processed at all for the COMPAT_32BIT stage, so that install32
problem does not apply either.

E.g. you are right, it's better to use ${LIBDIR} here. I'll fix that
now.

-Dimitry

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 194 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.freebsd.org/pipermail/svn-src-projects/attachments/20150127/d04590f5/attachment.sig>