Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Use Jessie sysroot for building on amd64 and i386

Aleksei Kuzmin 7 years ago
parent
c6ba812d79
commit
fe0a96200d
2 changed files with 3 additions and 3 deletions
Split View Show Diff Stats
  1. 1 1
      script/install-sysroot.py
  2. 2 2
      toolchain.gypi

+ 1 - 1
script/install-sysroot.py
View File 

@@ -85,7 +85,7 @@ def main(args):
 
 def InstallDefaultSysrootForArch(target_arch):
 
   if target_arch not in VALID_ARCHS:
 
     raise Error('Unknown architecture: %s' % target_arch)
 
-  if target_arch == 'arm64':
 
+  if target_arch in ['amd64', 'arm64', 'i386']:
 
     InstallSysroot('Jessie', target_arch)
 
   else:
 
     InstallSysroot('Wheezy', target_arch)

+ 2 - 2
toolchain.gypi
View File 

@@ -56,10 +56,10 @@
 
               'sysroot%': '<(source_root)/vendor/debian_jessie_arm64-sysroot',
 
             }],
 
             ['target_arch=="ia32"', {
 
-              'sysroot%': '<(source_root)/vendor/debian_wheezy_i386-sysroot',
 
+              'sysroot%': '<(source_root)/vendor/debian_jessie_i386-sysroot',
 
             }],
 
             ['target_arch=="x64"', {
 
-              'sysroot%': '<(source_root)/vendor/debian_wheezy_amd64-sysroot',
 
+              'sysroot%': '<(source_root)/vendor/debian_jessie_amd64-sysroot',
 
             }],
 
           ],
 
         },