From 2a69b6820f79b45779a0f4cb823a594e1fc7eae7 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl@icu-project.org>
Date: Thu, 12 Nov 2015 18:10:26 -0800
Subject: [PATCH] build: fix --with-intl=system-icu for x-compile

* add toolset stuff to icu-system.gyp
* update docs

Fixes: https://github.com/nodejs/node/issues/3801
PR-URL: https://github.com/nodejs/node/pull/3808
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 README.md                | 3 +++
 tools/icu/icu-system.gyp | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 3c14da04398185..e7db6624f56277 100644
--- a/README.md
+++ b/README.md
@@ -228,6 +228,9 @@ Windows:
 $ pkg-config --modversion icu-i18n && ./configure --with-intl=system-icu
 ```
 
+If you are cross compiling, your `pkg-config` must be able to supply a path
+that works for both your host and target environments.
+
 #### Build with a specific ICU:
 
 You can find other ICU releases at
diff --git a/tools/icu/icu-system.gyp b/tools/icu/icu-system.gyp
index 44d4f5feff4cab..b3ca0e39b6c9eb 100644
--- a/tools/icu/icu-system.gyp
+++ b/tools/icu/icu-system.gyp
@@ -9,10 +9,12 @@
     {
       'target_name': 'icuuc',
       'type': 'none',
+      'toolsets': [ 'host', 'target' ],
     },
     {
       'target_name': 'icui18n',
       'type': 'none',
+      'toolsets': [ 'host', 'target' ],
     },
   ],
 }