⚠ This page is served via a proxy. Original site: https://github.com
This service does not collect credentials or authentication data.
Skip to content

build: infer cargo mode with gyp var build_type directly #61354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
legendecas wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −8
Open

build: infer cargo mode with gyp var build_type directly #61354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1864,11 +1864,6 @@ def configure_library(lib, output, pkgname=None):
output['libraries'] += pkg_libs.split()


def configure_rust(o, configs):
set_configuration_variable(configs, 'cargo_build_mode', release='release', debug='debug')
set_configuration_variable(configs, 'cargo_build_flags', release=['--release'], debug=[])


def configure_v8(o, configs):
set_configuration_variable(configs, 'v8_enable_v8_checks', release=1, debug=0)

Expand Down Expand Up @@ -2468,7 +2463,6 @@ def make_bin_override():
configure_static(output)
configure_inspector(output)
configure_section_file(output)
configure_rust(output, configurations)

# remove builtins that have been disabled
if options.without_amaro:
Expand Down
16 changes: 14 additions & 2 deletions deps/crates/crates.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
{
'variables': {
'cargo_vendor_dir': './vendor',
'node_crates_libpath': '<(SHARED_INTERMEDIATE_DIR)/>(cargo_build_mode)/<(STATIC_LIB_PREFIX)node_crates<(STATIC_LIB_SUFFIX)',
},
'conditions': [
['build_type == "Release"', {
'variables': {
'cargo_build_flags': ['--release'],
'node_crates_libpath': '<(SHARED_INTERMEDIATE_DIR)/release/<(STATIC_LIB_PREFIX)node_crates<(STATIC_LIB_SUFFIX)',
},
}, {
'variables': {
'cargo_build_flags': [],
'node_crates_libpath': '<(SHARED_INTERMEDIATE_DIR)/debug/<(STATIC_LIB_PREFIX)node_crates<(STATIC_LIB_SUFFIX)',
},
}]
],
'targets': [
{
'target_name': 'node_crates',
Expand Down Expand Up @@ -38,7 +50,7 @@
'action': [
'cargo',
'rustc',
'>@(cargo_build_flags)',
'<@(cargo_build_flags)',
'--frozen',
'--target-dir',
'<(SHARED_INTERMEDIATE_DIR)'
Expand Down
Loading