CVS commit: pkgsrc/lang/clang

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Aug 26 14:56:21 UTC 2019

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

Log Message:
clang: fix CMAKE_ARGS.Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/lang/clang/Makefile.common

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.33 pkgsrc/lang/clang/Makefile.common:1.34
--- pkgsrc/lang/clang/Makefile.common:1.33      Mon Aug  5 19:06:49 2019
+++ pkgsrc/lang/clang/Makefile.common   Mon Aug 26 14:56:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.33 2019/08/05 19:06:49 adam Exp $
+# $NetBSD: Makefile.common,v 1.34 2019/08/26 14:56:21 adam Exp $
 # used by lang/clang/Makefile
 # used by lang/clang-static-analyzer/Makefile
 # used by lang/clang-tools-extra/Makefile
@@ -29,6 +29,8 @@ CMAKE_ARGS+=  -DCMAKE_CXX_COMPILER=${CXX:
 # XXX can't disable static-analyzer without also disabling ARCMT
 CMAKE_ARGS+=   -DCLANG_ENABLE_ARCMT=OFF
 
+.include "../../mk/compiler.mk"
+
 CMAKE_ARGS.Darwin+=    -DCMAKE_LIBTOOL=/usr/bin/libtool
 .if defined(OSX_SDK_PATH)
 CMAKE_ARGS.Darwin+=    -DDEFAULT_SYSROOT=${OSX_SDK_PATH:Q}
@@ -70,8 +72,6 @@ REPLACE_PYTHON+=      utils/hmaptool/hmaptool
 REPLACE_PYTHON+=       utils/token-delta.py
 REPLACE_PYTHON+=       www/builtins.py
 
-.include "../../mk/compiler.mk"
-
 .if ${OPSYS} == "NetBSD" && !empty(PKGSRC_COMPILER:Mclang)
 # command to check if clang is using libc++ or libstdc++
 LIBCPP_CHECK_SH=       printf "\#include <ciso646>\n\#ifdef _LIBCPP_VERSION\nYES\n\#endif" | ${CLANGBASE}/bin/clang++ -x c++ -E - 2>&1 | grep YES || true