CVS commit: pkgsrc/lang

["Brook Milligan" <brook%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   brook
Date:           Mon Jan 16 17:26:47 UTC 2017

Modified Files:
        pkgsrc/lang/clang: Makefile.common
        pkgsrc/lang/libLLVM: Makefile
        pkgsrc/lang/llvm: Makefile

Log Message:
Use the system-specific libtool on Darwin.

This fixes bugs relating to unrecognized libtool options on Darwin.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/lang/clang/Makefile.common
cvs rdiff -u -r1.16 -r1.17 pkgsrc/lang/libLLVM/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/llvm/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/clang/Makefile.common
diff -u pkgsrc/lang/clang/Makefile.common:1.17 pkgsrc/lang/clang/Makefile.common:1.18
--- pkgsrc/lang/clang/Makefile.common:1.17      Thu Jan  5 11:54:32 2017
+++ pkgsrc/lang/clang/Makefile.common   Mon Jan 16 17:26:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2017/01/05 11:54:32 adam Exp $
+# $NetBSD: Makefile.common,v 1.18 2017/01/16 17:26:47 brook Exp $
 # used by lang/clang/Makefile
 # used by lang/clang-static-analyzer/Makefile
 
@@ -28,6 +28,8 @@ CMAKE_ARGS+=  -DCMAKE_CXX_COMPILER=g++
 # XXX can't disable static-analyzer without also disabling ARCMT
 CMAKE_ARGS+=   -DCLANG_ENABLE_ARCMT=OFF
 
+CMAKE_ARGS.Darwin+=    -DCMAKE_LIBTOOL=/usr/bin/libtool
+
 REPLACE_PERL+=         test/make_test_dirs.pl
 REPLACE_PERL+=         tools/scan-build/bin/scan-build
 REPLACE_PERL+=         tools/scan-build/libexec/c++-analyzer

Index: pkgsrc/lang/libLLVM/Makefile
diff -u pkgsrc/lang/libLLVM/Makefile:1.16 pkgsrc/lang/libLLVM/Makefile:1.17
--- pkgsrc/lang/libLLVM/Makefile:1.16   Thu Jan  5 11:54:32 2017
+++ pkgsrc/lang/libLLVM/Makefile        Mon Jan 16 17:26:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2017/01/05 11:54:32 adam Exp $
+# $NetBSD: Makefile,v 1.17 2017/01/16 17:26:47 brook Exp $
 
 DISTNAME=      llvm-3.9.1.src
 PKGNAME=       ${DISTNAME:S/llvm/libLLVM/:S/.src//}
@@ -25,6 +25,8 @@ CMAKE_ARGS+=  -DCMAKE_CXX_COMPILER=g++
 CMAKE_ARGS+=   -DLLVM_BUILD_LLVM_DYLIB=ON
 CMAKE_ARGS+=   -DLLVM_INCLUDE_TESTS=OFF
 
+CMAKE_ARGS.Darwin+=    -DCMAKE_LIBTOOL=/usr/bin/libtool
+
 .for tool in   bugpoint bugpoint_passes dsymutil llc lli llvm_ar       \
        llvm_as llvm_bcanalyzer llvm_c_test llvm_cov llvm_cxxdump       \
        llvm_diff llvm_dis llvm_dwarfdump llvm_dwp llvm_extract llvm_go \

Index: pkgsrc/lang/llvm/Makefile
diff -u pkgsrc/lang/llvm/Makefile:1.12 pkgsrc/lang/llvm/Makefile:1.13
--- pkgsrc/lang/llvm/Makefile:1.12      Thu Jan  5 11:54:32 2017
+++ pkgsrc/lang/llvm/Makefile   Mon Jan 16 17:26:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2017/01/05 11:54:32 adam Exp $
+# $NetBSD: Makefile,v 1.13 2017/01/16 17:26:47 brook Exp $
 #
 # when updating this, please also update:
 # devel/include-what-you-use
@@ -33,6 +33,8 @@ CMAKE_ARGS+=  -DCMAKE_C_COMPILER=gcc
 CMAKE_ARGS+=   -DCMAKE_CXX_COMPILER=g++
 CMAKE_ARGS+=   -DLLVM_INSTALL_UTILS=ON
 
+CMAKE_ARGS.Darwin+=    -DCMAKE_LIBTOOL=/usr/bin/libtool
+
 CHECK_PORTABILITY_SKIP=        utils/buildit/build_llvm
 
 # XXX perl is not added as a tool as it does not seem to be required