Skip to content

Always enable deterministic_paths #23256

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

Merged
merged 3 commits into from
Jan 2, 2025
Merged

Always enable deterministic_paths #23256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52fd1b1
Always enable deterministic_paths
aheejin Dec 24, 2024
b6878f6
Automatic rebaseline of codesize expectations. NFC
aheejin Dec 27, 2024
9cc880f
Merge branch 'main' into always_deterministic_path
aheejin Jan 2, 2025
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
2 changes: 1 addition & 1 deletion embuilder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ def main():
if USE_NINJA:
library.generate()
else:
library.build(deterministic_paths=True)
library.build()
elif what == 'sysroot':
if do_clear:
cache.erase_file('sysroot_install.stamp')
Expand Down
2 changes: 1 addition & 1 deletion test/other/codesize/test_codesize_cxx_except.size
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
170928
170950
2 changes: 1 addition & 1 deletion test/other/codesize/test_codesize_cxx_except_wasm.size
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
142143
142154
2 changes: 1 addition & 1 deletion test/other/codesize/test_codesize_cxx_except_wasm_exnref.size
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
144730
144741
2 changes: 1 addition & 1 deletion test/other/codesize/test_codesize_cxx_mangle.size
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
232437
232468
15 changes: 6 additions & 9 deletions tools/system_libs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,17 +422,15 @@ def erase(self):
def get_path(self, absolute=False):
return cache.get_lib_name(self.get_filename(), absolute=absolute)

def build(self, deterministic_paths=False):
def build(self):
"""
Gets the cached path of this library.

This will trigger a build if this library is not in the cache.
"""
self.deterministic_paths = deterministic_paths
return cache.get(self.get_path(), self.do_build, force=USE_NINJA == 2, quiet=USE_NINJA)

def generate(self):
self.deterministic_paths = False
return cache.get(self.get_path(), self.do_generate, force=USE_NINJA == 2, quiet=USE_NINJA,
deferred=True)

Expand Down Expand Up @@ -600,12 +598,11 @@ def get_cflags(self):
if self.includes:
cflags += ['-I' + utils.path_from_root(i) for i in self._inherit_list('includes')]

if self.deterministic_paths:
source_dir = utils.path_from_root()
relative_source_dir = os.path.relpath(source_dir, self.build_dir)
cflags += [f'-ffile-prefix-map={relative_source_dir}={DETERMINISITIC_PREFIX}']
cflags += [f'-ffile-prefix-map={source_dir}={DETERMINISITIC_PREFIX}',
f'-fdebug-compilation-dir={DETERMINISITIC_PREFIX}']
source_dir = utils.path_from_root()
relative_source_dir = os.path.relpath(source_dir, self.build_dir)
cflags += [f'-ffile-prefix-map={source_dir}={DETERMINISITIC_PREFIX}',
f'-ffile-prefix-map={relative_source_dir}={DETERMINISITIC_PREFIX}',
f'-fdebug-compilation-dir={DETERMINISITIC_PREFIX}']
return cflags

def get_base_name_prefix(self):
Expand Down
Loading