Update to node.gyp's changes
This commit is contained in:
		
					parent
					
						
							
								8eb5e651a2
							
						
					
				
			
			
				commit
				
					
						04d24f61fe
					
				
			
		
					 2 changed files with 15 additions and 1 deletions
				
			
		| 
						 | 
				
			
			@ -9,6 +9,7 @@
 | 
			
		|||
    'component%': 'static_library',
 | 
			
		||||
    'python': 'python',
 | 
			
		||||
    'openssl_no_asm': 1,
 | 
			
		||||
    'node_target_type': 'shared_library',
 | 
			
		||||
    'node_install_npm': 'false',
 | 
			
		||||
    'node_prefix': '',
 | 
			
		||||
    'node_shared_cares': 'false',
 | 
			
		||||
| 
						 | 
				
			
			@ -99,7 +100,10 @@
 | 
			
		|||
        ],
 | 
			
		||||
      }],
 | 
			
		||||
      ['_target_name=="node"', {
 | 
			
		||||
        'include_dirs': [ '<(libchromiumcontent_src_dir)/v8/include' ],
 | 
			
		||||
        'include_dirs': [
 | 
			
		||||
          '<(libchromiumcontent_src_dir)/v8',
 | 
			
		||||
          '<(libchromiumcontent_src_dir)/v8/include',
 | 
			
		||||
        ],
 | 
			
		||||
        'conditions': [
 | 
			
		||||
          ['OS=="mac" and libchromiumcontent_component==0', {
 | 
			
		||||
            # -all_load is the "whole-archive" on OS X.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,6 +1,7 @@
 | 
			
		|||
#!/usr/bin/env python
 | 
			
		||||
 | 
			
		||||
import os
 | 
			
		||||
import platform
 | 
			
		||||
import subprocess
 | 
			
		||||
import sys
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -43,10 +44,19 @@ def run_gyp(target_arch, component):
 | 
			
		|||
  defines = [
 | 
			
		||||
    '-Dlibchromiumcontent_component={0}'.format(component),
 | 
			
		||||
    '-Dtarget_arch={0}'.format(target_arch),
 | 
			
		||||
    '-Dhost_arch={0}'.format(target_arch),
 | 
			
		||||
    '-Dlibrary=static_library',
 | 
			
		||||
  ]
 | 
			
		||||
  return subprocess.call([python, gyp, '-f', 'ninja', '--depth', '.',
 | 
			
		||||
                          'atom.gyp', '-Icommon.gypi'] + defines)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def get_host_arch():
 | 
			
		||||
  if platform.architecture()[0] == '32bit':
 | 
			
		||||
    return 'ia32'
 | 
			
		||||
  else:
 | 
			
		||||
    return 'x64'
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
if __name__ == '__main__':
 | 
			
		||||
  sys.exit(main())
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue