Skip to content
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

Define NODE_JS_EXECUTABLE based on an env var #190

Merged
merged 2 commits into from
Oct 27, 2021
Merged

Define NODE_JS_EXECUTABLE based on an env var #190

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5932416
Define NODE_JS_EXECUTABLE based on an env var
steven-johnson Oct 27, 2021
ee2be14
Update master.cfg
steven-johnson Oct 27, 2021
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
12 changes: 11 additions & 1 deletion master/master.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,6 +587,11 @@ def get_halide_cmake_definitions(builder_type, halide_target='host'):
if builder_type.os == 'windows':
cmake_definitions['CMAKE_TOOLCHAIN_FILE'] = Interpolate('%(prop:VCPKG_ROOT)s/scripts/buildsystems/vcpkg.cmake')

# TODO: HALIDE_NODE_JS_PATH is only necessary until EMSDK updates their built-in version of Node
# to v16.13+; when that is done, remove this definition.
if builder_type.handles_wasm():
cmake_definitions['NODE_JS_EXECUTABLE'] = Property('HALIDE_NODE_JS_PATH')

return cmake_definitions


Expand Down Expand Up @@ -703,8 +708,13 @@ def add_env_setup_step(factory, builder_type, enable_ccache=False):
'LD': ld,
}

# TODO: HALIDE_NODE_JS_PATH is only necessary until EMSDK updates their built-in version of Node
# to v16.13+; when that is done, remove HALIDE_NODE_JS_PATH here and on the workers.
factory.addStep(SetPropertiesFromEnv(name='Read worker environment',
variables=['VCPKG_ROOT', 'LD_LIBRARY_PATH', 'HL_HEXAGON_TOOLS']))
variables=['VCPKG_ROOT',
'LD_LIBRARY_PATH',
'HL_HEXAGON_TOOLS',
'HALIDE_NODE_JS_PATH']))

vcpkg_root = Property('VCPKG_ROOT', default=None)

Expand Down