diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2022-12-10 15:57:36 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2022-12-19 11:25:55 +0000 |
| commit | 70670ad4b385c2492231224139bbef616275f8ba (patch) | |
| tree | abec7b79aa48a1ff640e7cfe4b01479f5793c4e3 /static | |
| parent | 7c8d7e17cef8d150cc6bcb428e376b05a9603eb6 (diff) | |
use $(file …) directly instead of gb_var2file when not used as intermediate
i.e. when the temporary file is not uses as a responsefile for another
command, but instead the point of running gb_var2file is to have that
file as a result in the end.
also move the helper into the main gbuild.mk and remove Tempfile.mk
Change-Id: I79382bef5d7e8a155ba6a8e0750c6a17da42eb37
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143912
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
(cherry picked from commit 8b87e29c987c599058a70f6a2e0259a2a4100f04)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144061
Diffstat (limited to 'static')
| -rw-r--r-- | static/CustomTarget_emscripten_fs_image.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/static/CustomTarget_emscripten_fs_image.mk b/static/CustomTarget_emscripten_fs_image.mk index e8810bd2e2f7..f2cf08f65107 100644 --- a/static/CustomTarget_emscripten_fs_image.mk +++ b/static/CustomTarget_emscripten_fs_image.mk @@ -1514,10 +1514,9 @@ $(emscripten_fs_image_WORKDIR)/soffice.data.filelist: \ $(emscripten_fs_image_WORKDIR)/soffice.data.concat_lists \ $(gb_emscripten_fs_image_files) \ | $(emscripten_fs_image_WORKDIR)/.dir - TEMPFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),\ + $(file >$@,\ $(subst @,@@,$(subst $(BUILDDIR)/,,$(filter $(BUILDDIR)%,$(gb_emscripten_fs_image_all_files)))) \ - $(foreach item,$(filter-out $(BUILDDIR)%,$(gb_emscripten_fs_image_all_files)),$(subst @,@@,$(item))@$(subst @,@@,$(subst $(SRCDIR)/,,$(item))))) \ - && mv $$TEMPFILE $@ + $(foreach item,$(filter-out $(BUILDDIR)%,$(gb_emscripten_fs_image_all_files)),$(subst @,@@,$(item))@$(subst @,@@,$(subst $(SRCDIR)/,,$(item))))) # Unfortunately the file packager just allows a cmdline file list, but all paths are # relative to $(BUILDDIR), so we won't run out of cmdline space that fast... |