GeezerVison is showing github.com — build: infer cargo mode with gyp var build_type directly · nodejs/node@86e2a76
File treeExpand file treeCollapse file tree Open diff view settings Expand file treeCollapse file tree Open diff view settings Collapse file Copy file name to clipboardExpand all lines: configure.py -6Lines changed: 0 additions & 6 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -1864,11 +1864,6 @@ def configure_library(lib, output, pkgname=None): | 1864 | 1864 | output['libraries'] += pkg_libs.split() | 1865 | 1865 |
| 1866 | 1866 |
| 1867 | | -def configure_rust(o, configs): | 1868 | | - set_configuration_variable(configs, 'cargo_build_mode', release='release', debug='debug') | 1869 | | - set_configuration_variable(configs, 'cargo_build_flags', release=['--release'], debug=[]) | 1870 | | - | 1871 | | - | 1872 | 1867 | def configure_v8(o, configs): | 1873 | 1868 | set_configuration_variable(configs, 'v8_enable_v8_checks', release=1, debug=0) | 1874 | 1869 |
| @@ -2467,7 +2462,6 @@ def make_bin_override(): | 2467 | 2462 | configure_static(output) | 2468 | 2463 | configure_inspector(output) | 2469 | 2464 | configure_section_file(output) | 2470 | | -configure_rust(output, configurations) | 2471 | 2465 |
| 2472 | 2466 | # remove builtins that have been disabled | 2473 | 2467 | if options.without_amaro: | |
Collapse file Copy file name to clipboardExpand all lines: deps/crates/crates.gyp +14-2Lines changed: 14 additions & 2 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 1 | 1 | { | 2 | 2 | 'variables': { | 3 | 3 | 'cargo_vendor_dir': './vendor', | 4 | | - 'node_crates_libpath': '<(SHARED_INTERMEDIATE_DIR)/>(cargo_build_mode)/<(STATIC_LIB_PREFIX)node_crates<(STATIC_LIB_SUFFIX)', | 5 | 4 | }, | | 5 | + 'conditions': [ | | 6 | + ['build_type == "Release"', { | | 7 | + 'variables': { | | 8 | + 'cargo_build_flags': ['--release'], | | 9 | + 'node_crates_libpath': '<(SHARED_INTERMEDIATE_DIR)/release/<(STATIC_LIB_PREFIX)node_crates<(STATIC_LIB_SUFFIX)', | | 10 | + }, | | 11 | + }, { | | 12 | + 'variables': { | | 13 | + 'cargo_build_flags': [], | | 14 | + 'node_crates_libpath': '<(SHARED_INTERMEDIATE_DIR)/debug/<(STATIC_LIB_PREFIX)node_crates<(STATIC_LIB_SUFFIX)', | | 15 | + }, | | 16 | + }] | | 17 | + ], | 6 | 18 | 'targets': [ | 7 | 19 | { | 8 | 20 | 'target_name': 'node_crates', | | 38 | 50 | 'action': [ | 39 | 51 | 'cargo', | 40 | 52 | 'rustc', | 41 | | - '>@(cargo_build_flags)', | | 53 | + '<@(cargo_build_flags)', | 42 | 54 | '--frozen', | 43 | 55 | '--target-dir', | 44 | 56 | '<(SHARED_INTERMEDIATE_DIR)' | |
|