A RetroSearch Logo

Home - News ( United States | United Kingdom | Italy | Germany ) - Football scores

Search Query:

Showing content from https://github.com/nodejs/node/commit/bfbed0afd5 below:

fix conflict gyp configs · nodejs/node@bfbed0a · GitHub

@@ -1306,6 +1306,9 @@ def host_arch_win():

1306 1306 1307 1307

return matchup.get(arch, 'ia32')

1308 1308 1309 +

def set_configuration_variable(configs, name, release=None, debug=None):

1310 +

configs['Release'][name] = release

1311 +

configs['Debug'][name] = debug

1309 1312 1310 1313

def configure_arm(o):

1311 1314

if options.arm_float_abi:

@@ -1620,7 +1623,9 @@ def configure_library(lib, output, pkgname=None):

1620 1623

output['libraries'] += pkg_libs.split()

1621 1624 1622 1625 1623 -

def configure_v8(o):

1626 +

def configure_v8(o, configs):

1627 +

set_configuration_variable(configs, 'v8_enable_v8_checks', release=1, debug=0)

1628 + 1624 1629

o['variables']['v8_enable_webassembly'] = 0 if options.v8_lite_mode else 1

1625 1630

o['variables']['v8_enable_javascript_promise_hooks'] = 1

1626 1631

o['variables']['v8_enable_lite_mode'] = 1 if options.v8_lite_mode else 0

@@ -1638,7 +1643,6 @@ def configure_v8(o):

1638 1643

o['variables']['v8_enable_31bit_smis_on_64bit_arch'] = 1 if options.enable_pointer_compression else 0

1639 1644

o['variables']['v8_enable_shared_ro_heap'] = 0 if options.enable_pointer_compression or options.disable_shared_ro_heap else 1

1640 1645

o['variables']['v8_enable_extensible_ro_snapshot'] = 0

1641 -

o['variables']['v8_enable_v8_checks'] = 1 if options.debug else 0

1642 1646

o['variables']['v8_trace_maps'] = 1 if options.trace_maps else 0

1643 1647

o['variables']['node_use_v8_platform'] = b(not options.without_v8_platform)

1644 1648

o['variables']['node_use_bundled_v8'] = b(not options.without_bundled_v8)

@@ -2154,6 +2158,10 @@ def make_bin_override():

2154 2158

'defines': [],

2155 2159

'cflags': [],

2156 2160

}

2161 +

configurations = {

2162 +

'Release': { 'variables': {} },

2163 +

'Debug': { 'variables': {} },

2164 +

}

2157 2165 2158 2166

# Print a warning when the compiler is too old.

2159 2167

check_compiler(output)

@@ -2181,7 +2189,7 @@ def make_bin_override():

2181 2189

configure_library('ngtcp2', output, pkgname='libngtcp2')

2182 2190

configure_library('sqlite', output, pkgname='sqlite3')

2183 2191

configure_library('uvwasi', output, pkgname='libuvwasi')

2184 -

configure_v8(output)

2192 +

configure_v8(output, configurations)

2185 2193

configure_openssl(output)

2186 2194

configure_intl(output)

2187 2195

configure_static(output)

@@ -2204,7 +2212,6 @@ def make_bin_override():

2204 2212

# move everything else to target_defaults

2205 2213

variables = output['variables']

2206 2214

del output['variables']

2207 -

variables['is_debug'] = B(options.debug)

2208 2215 2209 2216

# make_global_settings should be a root level element too

2210 2217

if 'make_global_settings' in output:

@@ -2213,6 +2220,9 @@ def make_bin_override():

2213 2220

else:

2214 2221

make_global_settings = False

2215 2222 2223 +

# Add configurations to target defaults

2224 +

output['configurations'] = configurations

2225 + 2216 2226

output = {

2217 2227

'variables': variables,

2218 2228

'target_defaults': output,

@@ -2223,7 +2233,7 @@ def make_bin_override():

2223 2233

print_verbose(output)

2224 2234 2225 2235

write('config.gypi', do_not_edit +

2226 -

pprint.pformat(output, indent=2, width=1024) + '\n')

2236 +

pprint.pformat(output, indent=2, width=128) + '\n')

2227 2237 2228 2238

write('config.status', '#!/bin/sh\nset -x\nexec ./configure ' +

2229 2239

' '.join([shlex.quote(arg) for arg in original_argv]) + '\n')


RetroSearch is an open source project built by @garambo | Open a GitHub Issue

Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo

HTML: 3.2 | Encoding: UTF-8 | Version: 0.7.4