Skip to content

Always use -fmacro-prefix-map #23212

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

Closed
wants to merge 4 commits into from
Closed

Always use -fmacro-prefix-map #23212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
42986e0
Always use -fmacro-prefix-map
aheejin Dec 18, 2024
ba62274
Fix test_dwarf_system_lib
aheejin Dec 19, 2024
7d15c0d
Merge branch 'main' into macro_prefix
aheejin Dec 21, 2024
62b8149
Automatic rebaseline of codesize expectations. NFC
aheejin Dec 21, 2024
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 @@ -291,7 +291,7 @@ def main():
library.erase()
if do_build:
if USE_NINJA:
library.generate()
library.generate(deterministic_paths=True)
else:
library.build(deterministic_paths=True)
elif what == 'sysroot':
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
13 changes: 8 additions & 5 deletions tools/system_libs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,8 +431,8 @@ def build(self, deterministic_paths=False):
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
def generate(self, deterministic_paths=False):
self.deterministic_paths = deterministic_paths
return cache.get(self.get_path(), self.do_generate, force=USE_NINJA == 2, quiet=USE_NINJA,
deferred=True)

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

source_dir = utils.path_from_root()
relative_source_dir = os.path.relpath(source_dir, self.build_dir)
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'-ffile-prefix-map={relative_source_dir}={DETERMINISITIC_PREFIX}',
f'-fdebug-compilation-dir={DETERMINISITIC_PREFIX}']
Comment on lines 606 to 608
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if deterministic_paths part hasn't changed; I only merged two cflags += ... into one and changed the order of the flags.

else:
cflags += [f'-fmacro-prefix-map={source_dir}={DETERMINISITIC_PREFIX}',
f'-fmacro-prefix-map={relative_source_dir}={DETERMINISITIC_PREFIX}']
return cflags

def get_base_name_prefix(self):
Expand Down
Loading