Skip to content

Commit 75d0460

Browse files
committed
Update emscripten/version.h whenever we update emscripten-version.txt
Fixes: emscripten-core/emscripten#26226
1 parent 7cafe37 commit 75d0460

1 file changed

Lines changed: 14 additions & 1 deletion

File tree

emsdk.py

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2179,11 +2179,24 @@ def install_tool(self):
21792179
# (If this is not an actual release, but some other build, then we do not
21802180
# write anything.)
21812181
if hasattr(self, 'emscripten_releases_hash'):
2182-
emscripten_version_file_path = os.path.join(to_native_path(self.expand_vars(self.activated_path)), 'emscripten-version.txt')
2182+
emscripten_root = to_native_path(self.expand_vars(self.activated_path))
2183+
emscripten_version_file_path = os.path.join(emscripten_root, 'emscripten-version.txt')
21832184
version = get_emscripten_release_version(self.emscripten_releases_hash)
21842185
if version:
21852186
with open(emscripten_version_file_path, 'w') as f:
21862187
f.write('"%s"\n' % version)
2188+
emscripten_version_header = os.path.join(emscripten_root, 'cache/sysroot/include/emscripten/version.h')
2189+
if os.path.exists(emscripten_version_header):
2190+
header = open(emscripten_version_header).read()
2191+
major, minor, tiny = version.split('.')
2192+
header = re.sub(r'define __EMSCRIPTEN_MAJOR__ \d*', f'define __EMSCRIPTEN_MAJOR__ {major}', header)
2193+
header = re.sub(r'define __EMSCRIPTEN_MINOR__ \d*', f'define __EMSCRIPTEN_MINOR__ {minor}', header)
2194+
header = re.sub(r'define __EMSCRIPTEN_TINY__ \d*', f'define __EMSCRIPTEN_TINY__ {tiny}', header)
2195+
header = re.sub(r'define __EMSCRIPTEN_major__ \d*', f'define __EMSCRIPTEN_major__ {major}', header)
2196+
header = re.sub(r'define __EMSCRIPTEN_minor__ \d*', f'define __EMSCRIPTEN_minor__ {minor}', header)
2197+
header = re.sub(r'define __EMSCRIPTEN_tiny__ \d*', f'define __EMSCRIPTEN_tiny__ {tiny}', header)
2198+
with open(emscripten_version_header, 'w') as f:
2199+
f.write(header)
21872200

21882201
print(f"Done installing tool '{self}'.")
21892202

0 commit comments

Comments
 (0)