[core] upgrade gyp to git commit 6fb8bd8

https://chromium.googlesource.com/external/gyp/+/6fb8bd829f0ca8fd432fd85ede788b6881c4f09f

2 files changed, 63 insertions, 0 deletions

diff --git a/deps/gyp/test/make_global_settings/env-wrapper/gyptest-wrapper.py b/deps/gyp/test/make_global_settings/env-wrapper/gyptest-wrapper.py
new file mode 100644
index 0000000000..70d6906cca
--- /dev/null
+++ b/deps/gyp/test/make_global_settings/env-wrapper/gyptest-wrapper.py
@@ -0,0 +1,46 @@
+#!/usr/bin/env python
+
+# Copyright (c) 2013 Google Inc. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+"""
+Verifies *_wrapper in environment.
+"""
+
+import os
+import sys
+import TestGyp
+
+test_format = ['ninja']
+
+os.environ['CC_wrapper'] = 'distcc'
+os.environ['LINK_wrapper'] = 'distlink'
+os.environ['CC.host_wrapper'] = 'ccache'
+
+test = TestGyp.TestGyp(formats=test_format)
+
+old_env = dict(os.environ)
+os.environ['GYP_CROSSCOMPILE'] = '1'
+test.run_gyp('wrapper.gyp')
+os.environ.clear()
+os.environ.update(old_env)
+
+if test.format == 'ninja':
+  cc_expected = ('cc = ' + os.path.join('..', '..', 'distcc') + ' ' +
+                 os.path.join('..', '..', 'clang'))
+  cc_host_expected = ('cc_host = ' + os.path.join('..', '..', 'ccache') + ' ' +
+                      os.path.join('..', '..', 'clang'))
+  ld_expected = 'ld = ../../distlink $cc'
+  if sys.platform != 'win32':
+    ldxx_expected = 'ldxx = ../../distlink $cxx'
+
+  if sys.platform == 'win32':
+     ld_expected = 'link.exe'
+  test.must_contain('out/Default/build.ninja', cc_expected)
+  test.must_contain('out/Default/build.ninja', cc_host_expected)
+  test.must_contain('out/Default/build.ninja', ld_expected)
+  if sys.platform != 'win32':
+    test.must_contain('out/Default/build.ninja', ldxx_expected)
+
+test.pass_test()
diff --git a/deps/gyp/test/make_global_settings/env-wrapper/wrapper.gyp b/deps/gyp/test/make_global_settings/env-wrapper/wrapper.gyp
new file mode 100644
index 0000000000..1698d71dd4
--- /dev/null
+++ b/deps/gyp/test/make_global_settings/env-wrapper/wrapper.gyp
@@ -0,0 +1,17 @@
+# Copyright (c) 2013 Google Inc. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'make_global_settings': [
+    ['CC', 'clang'],
+    ['CC.host', 'clang'],
+  ],
+  'targets': [
+    {
+      'target_name': 'test',
+      'type': 'static_library',
+      'sources': [ 'foo.c' ],
+    },
+  ],
+}