Skip to content

Commit ef77dcc

Browse files
authored
Add suggestion to install using --permanent or --system on windows. NFC (#1308)
Fixes: #1307
1 parent b54a6b6 commit ef77dcc

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

emsdk.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1508,7 +1508,7 @@ def load_em_config():
15081508
pass
15091509

15101510

1511-
def generate_em_config(active_tools):
1511+
def generate_em_config(active_tools, permanently_activate, system):
15121512
cfg = 'import os\n'
15131513
cfg += "emsdk_path = os.path.dirname(os.getenv('EM_CONFIG')).replace('\\\\', '/')\n"
15141514

@@ -1546,7 +1546,14 @@ def generate_em_config(active_tools):
15461546
rmfile(os.path.join(EMSDK_PATH, ".emscripten_sanity"))
15471547

15481548
path_add = get_required_path(active_tools)
1549-
if not WINDOWS:
1549+
1550+
# Give some recommended next step, depending on the platform
1551+
if WINDOWS:
1552+
if not permanently_activate and not system:
1553+
print('Next steps:')
1554+
print('- Consider running `emsdk activate` with --permanent or --system')
1555+
print(' to have emsdk settings available on startup.')
1556+
else:
15501557
emsdk_env = sdk_path('emsdk_env.sh')
15511558
print('Next steps:')
15521559
print('- To conveniently access emsdk tools from the command line,')
@@ -2413,7 +2420,7 @@ def set_active_tools(tools_to_activate, permanently_activate, system):
24132420
print('Setting the following tools as active:\n ' + '\n '.join(map(lambda x: str(x), tools)))
24142421
print('')
24152422

2416-
generate_em_config(tools_to_activate)
2423+
generate_em_config(tools_to_activate, permanently_activate, system)
24172424

24182425
# Construct a .bat or .ps1 script that will be invoked to set env. vars and PATH
24192426
# We only do this on cmd or powershell since emsdk.bat/ps1 is able to modify the

0 commit comments

Comments
 (0)