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>

diff --git a/README.md b/README.md
index ab0490ab1d1ff90f3653c29cfcc1d901eac19c3c..5eaf41a770f1b925f69e9f826a067003cbc3636c 100644 (file)
--- a/README.md
+++ b/README.md
@@ -257,6 +257,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 44d4f5feff4cab0fcbe930c8da77fde7c2945f93..b3ca0e39b6c9ebbe5d238b05c21aac8077d6cb29 100644 (file)
--- 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' ],
     },
   ],
 }