coreclr-git: Pass env variables via Makefile (thanks riastradh@)

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Mon Feb 8 04:21:02 2016 +0100
Changeset:	f51788d1b9806595e891692f3aa6e823aa6dfd98

Modified Files:
	coreclr-git/Makefile
	coreclr-git/distinfo
	coreclr-git/patches/patch-src_pal_tools_gen-buildsys-clang.sh

Log Message:
coreclr-git: Pass env variables via Makefile (thanks riastradh@)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f51788d1b9806595e891692f3aa6e823aa6dfd98

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

diffstat:
 coreclr-git/Makefile                                         |  2 +-
 coreclr-git/distinfo                                         |  2 +-
 .../patches/patch-src_pal_tools_gen-buildsys-clang.sh        | 12 +-----------
 3 files changed, 3 insertions(+), 13 deletions(-)

diffs:
diff --git a/coreclr-git/Makefile b/coreclr-git/Makefile
index 4385c96..2b8d499 100644
--- a/coreclr-git/Makefile
+++ b/coreclr-git/Makefile
@@ -26,7 +26,7 @@ do-configure:
 
 do-build:
 	${RUN} cd ${WRKSRC} && \
-	${PKGSRC_SETENV} CMAKE_ENV_EXTRA="${CONFIGURE_ENV}" CMAKE_ARGS_EXTRA="${CMAKE_ARGS}" PYTHON=${PYTHONBIN} ./build.sh
+	${PKGSRC_SETENV} ${CONFIGURE_ENV} CMAKE_ARGS_EXTRA=${CMAKE_ARGS:Q} PYTHON=${PYTHONBIN:Q} ./build.sh
 
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../wip/llvm-git/buildlink3.mk"
diff --git a/coreclr-git/distinfo b/coreclr-git/distinfo
index d948a30..d975510 100644
--- a/coreclr-git/distinfo
+++ b/coreclr-git/distinfo
@@ -1,4 +1,4 @@
 $NetBSD$
 
 SHA1 (patch-src_pal_inc_pal__char16.h) = 205f6a8533838c192b36bbb00155da1b02e0f629
-SHA1 (patch-src_pal_tools_gen-buildsys-clang.sh) = 5effc7914f7ca45bc084572983baa4f2ddfc9888
+SHA1 (patch-src_pal_tools_gen-buildsys-clang.sh) = 2b701661e4d3bbf68a8d249a35d80e8a83bc563d
diff --git a/coreclr-git/patches/patch-src_pal_tools_gen-buildsys-clang.sh b/coreclr-git/patches/patch-src_pal_tools_gen-buildsys-clang.sh
index c2d04e4..d2757ec 100644
--- a/coreclr-git/patches/patch-src_pal_tools_gen-buildsys-clang.sh
+++ b/coreclr-git/patches/patch-src_pal_tools_gen-buildsys-clang.sh
@@ -2,17 +2,7 @@ $NetBSD$
 
 --- src/pal/tools/gen-buildsys-clang.sh.orig	2016-01-18 21:51:39.000000000 +0000
 +++ src/pal/tools/gen-buildsys-clang.sh
-@@ -133,6 +133,9 @@ if [[ -n "$CROSSCOMPILE" ]]; then
-     cmake_extra_defines="$cmake_extra_defines -DCMAKE_TOOLCHAIN_FILE=$1/cross/$build_arch/toolchain.cmake"
- fi
- 
-+# Allow to specify additional parameters via environment variables.
-+
-+$CMAKE_ENV_EXTRA \
- cmake \
-   -G "$generator" \
-   "-DCMAKE_USER_MAKE_RULES_OVERRIDE=$1/src/pal/tools/clang-compiler-override.txt" \
-@@ -144,4 +147,5 @@ cmake \
+@@ -144,4 +144,5 @@ cmake \
    "-DCMAKE_ENABLE_CODE_COVERAGE=$code_coverage" \
    "-DCLR_CMAKE_BUILD_TESTS=$build_tests" \
    $cmake_extra_defines \