Fix error when cross compilation

2018-01-31 17:13:59 +09:00 · 2018-01-31 17:13:59 +09:00 · 81c23b84e7
commit 81c23b84e7
parent b25175a19a
2 changed files with 7 additions and 2 deletions
--- a/common.gypi
+++ b/common.gypi
@ -245,7 +245,7 @@
          }],  # OS=="win"
        ],
      }],
-      ['OS=="linux" and _target_name in ["dump_syms", "node"]', {
+      ['OS=="linux" and _toolset=="target" and _target_name in ["dump_syms", "node"]', {
        'conditions': [
          ['libchromiumcontent_component==0', {
            'libraries': [
--- a/toolchain.gypi
+++ b/toolchain.gypi
@ -129,7 +129,7 @@
              'OTHER_LDFLAGS': [ '-stdlib=libc++' ],
            },
          }],
-          ['OS=="linux"', {
+          ['OS=="linux" and _toolset=="target"', {
            'cflags_cc': [
              '-std=gnu++14',
              '-nostdinc++',
@ -140,6 +140,11 @@
              '-nostdlib++',
            ],
          }],
+          ['OS=="linux" and _toolset=="host"', {
+            'cflags_cc': [
+              '-std=gnu++14',
+            ],
+          }],
        ],
      },
    }],  # clang==1