Use platform toolchain

The electron has used toolchain debian_wheezy_amd64-sysroot
that is downloaded from amazon server.

This makes electron use platfrom toolchain.

Change-Id: I59ba9d8954a770b7a95d0c4c2540678acffeb3e9
Signed-off-by: Youngsoo Choi <kenshin.choi@samsung.com>

diff --git a/common.gypi b/common.gypi
index 80d3b13..3c8aaf0 100644 (file)
--- a/common.gypi
+++ b/common.gypi
@@ -1,9 +1,16 @@
 {
   'includes': [
-    'toolchain.gypi',
     'vendor/brightray/brightray.gypi',
     'efl/features.gypi',
   ],
+  'conditions': [
+    ['use_efl!=1', {
+      'includes': [
+        'toolchain.gypi',
+      ],
+    }]
+   ],
+
   'variables': {
     # Tell crashpad to build as external project.
     'crashpad_dependencies': 'external',

diff --git a/electron.gyp b/electron.gyp
index 3c5f7c1..49735c5 100644 (file)
--- a/electron.gyp
+++ b/electron.gyp
@@ -342,16 +342,6 @@
             '<@(lib_sources_linux)',
             '<@(lib_sources_nss)',
           ],
-          'link_settings': {
-            'ldflags': [
-              # Make binary search for libraries under current directory, so we
-              # don't have to manually set $LD_LIBRARY_PATH:
-              # http://serverfault.com/questions/279068/cant-find-so-in-the-same-directory-as-the-executable
-              '-rpath \$$ORIGIN',
-              # Make native module dynamic loading work.
-              '-rdynamic',
-            ],
-          },
           # Required settings of using breakpad.
           'cflags_cc': [
             '-Wno-empty-body',
@@ -364,6 +354,18 @@
             'vendor/breakpad/breakpad.gyp:breakpad_client',
           ],
         }],  # OS=="linux"
+        ['use_efl!=1', {
+          'link_settings': {
+            'ldflags': [
+              # Make binary search for libraries under current directory, so we
+              # don't have to manually set $LD_LIBRARY_PATH:
+              # http://serverfault.com/questions/279068/cant-find-so-in-the-same-directory-as-the-executable
+              '-rpath \$$ORIGIN',
+              # Make native module dynamic loading work.
+              '-rdynamic',
+            ],
+          },
+        }],  # use_efl!=1
       ],
     },  # target <(product_name)_lib
     {