Skip to content

Commit 0e98c20

Browse files
committed
Use /emsdk/emscripten for relative path substitution
When `deterministic_paths` is set, we are currently using `-ffile-prefix-map` to produce the same path in data and debug info. In the case of absolute paths, their emscripten path is replaced with a fake path `/emsdk/emscripten`, and in the case of relative paths, all path relative to the emscripten directory is removed, so `../../system/lib/somefile.c` becomes `system/lib/somefiles.c`. https://github.com/emscripten-core/emscripten/blob/f66b5d706e174d9e5cc6122c06ea29dcd2735cd0/tools/system_libs.py#L472-L477 https://github.com/emscripten-core/emscripten/blob/f66b5d706e174d9e5cc6122c06ea29dcd2735cd0/tools/system_libs.py#L495-L501 So this does not make relative paths and absolute paths the same, which can lead to different builds depending on whether the command line uses absolute paths vs. relative ones. Currently we use relative paths when `EMCC_BATCH_BUILD` is set. And Ninja builds cannot use relative paths. This is also what was suggested in emscripten-core#23195 (comment) while discussins `__FILE__` problem in emscripten-core#23915. This does not change any code size tests because no code size tests happens to contain `__FILE__` at the moment. (One will be added in emscripten-core#22994)
1 parent b330159 commit 0e98c20

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

tools/system_libs.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@
4242
# link time.
4343
USE_NINJA = int(os.environ.get('EMCC_USE_NINJA', '0'))
4444

45+
# A fake emscripten path to use in __FILE__ macro and debug info to produce
46+
# reproducible builds across platforms.
47+
FAKE_EMSCRIPTEN_PATH = '/emsdk/emscripten'
48+
4549

4650
def files_in_path(path, filenames):
4751
srcdir = utils.path_from_root(path)
@@ -472,9 +476,9 @@ def generate_ninja(self, build_dir, libname):
472476
if self.deterministic_paths:
473477
source_dir = utils.path_from_root()
474478
relative_source_dir = os.path.relpath(source_dir, build_dir)
475-
cflags += [f'-ffile-prefix-map={source_dir}=/emsdk/emscripten',
476-
f'-ffile-prefix-map={relative_source_dir}/=',
477-
'-fdebug-compilation-dir=/emsdk/emscripten']
479+
cflags += [f'-ffile-prefix-map={source_dir}={FAKE_EMSCRIPTEN_PATH}',
480+
f'-ffile-prefix-map={relative_source_dir}={FAKE_EMSCRIPTEN_PATH}',
481+
'-fdebug-compilation-dir={FAKE_EMSCRIPTEN_PATH}']
478482
asflags = get_base_cflags(preprocess=False)
479483
input_files = self.get_files()
480484
ninja_file = os.path.join(build_dir, 'build.ninja')
@@ -496,9 +500,9 @@ def build_objects(self, build_dir):
496500
source_dir = utils.path_from_root()
497501
if batch_inputs:
498502
relative_source_dir = os.path.relpath(source_dir, build_dir)
499-
cflags += [f'-ffile-prefix-map={relative_source_dir}/=']
500-
cflags += [f'-ffile-prefix-map={source_dir}=/emsdk/emscripten',
501-
'-fdebug-compilation-dir=/emsdk/emscripten']
503+
cflags += [f'-ffile-prefix-map={relative_source_dir}={FAKE_EMSCRIPTEN_PATH}']
504+
cflags += [f'-ffile-prefix-map={source_dir}={FAKE_EMSCRIPTEN_PATH}',
505+
'-fdebug-compilation-dir={FAKE_EMSCRIPTEN_PATH}']
502506
case_insensitive = is_case_insensitive(build_dir)
503507
for src in self.get_files():
504508
ext = shared.suffix(src)

0 commit comments

Comments
 (0)