diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:35:37 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:35:37 +0000 |
| commit | a90a5cba08fdf6c0ceb95101c275108a152a3aed (patch) | |
| tree | 532507288f3defd7f4dcf1af49698bcb76034855 /config/makefiles | |
| parent | Adding debian version 126.0.1-1. (diff) | |
| download | firefox-a90a5cba08fdf6c0ceb95101c275108a152a3aed.tar.xz firefox-a90a5cba08fdf6c0ceb95101c275108a152a3aed.zip | |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'config/makefiles')
| -rw-r--r-- | config/makefiles/rust.mk | 4 | ||||
| -rw-r--r-- | config/makefiles/target_binaries.mk | 10 |
2 files changed, 2 insertions, 12 deletions
diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk index 52c4e402f9..524bc436fd 100644 --- a/config/makefiles/rust.mk +++ b/config/makefiles/rust.mk @@ -265,7 +265,7 @@ endif ifndef RUSTC_BOOTSTRAP RUSTC_BOOTSTRAP := mozglue_static,qcms ifdef MOZ_RUST_SIMD -RUSTC_BOOTSTRAP := $(RUSTC_BOOTSTRAP),encoding_rs,packed_simd +RUSTC_BOOTSTRAP := $(RUSTC_BOOTSTRAP),encoding_rs,any_all_workaround endif export RUSTC_BOOTSTRAP endif @@ -344,7 +344,7 @@ endif # # $(call CARGO_BUILD) define CARGO_BUILD -$(call RUN_CARGO,rustc$(if $(BUILDSTATUS), --timings)) +$(call RUN_CARGO,rustc$(if $(BUILDSTATUS), --timings)$(if $(findstring k,$(filter-out --%, $(MAKEFLAGS))), --keep-going)) endef cargo_host_linker_env_var := CARGO_TARGET_$(call varize,$(RUST_HOST_TARGET))_LINKER diff --git a/config/makefiles/target_binaries.mk b/config/makefiles/target_binaries.mk index 31b2c4367e..c7b6259e75 100644 --- a/config/makefiles/target_binaries.mk +++ b/config/makefiles/target_binaries.mk @@ -14,16 +14,6 @@ PROGRAMS_TARGET := target INSTALL_TARGETS += PROGRAMS endif - -ifdef SHARED_LIBRARY -SHARED_LIBRARY_FILES = $(SHARED_LIBRARY) -SHARED_LIBRARY_DEST ?= $(FINAL_TARGET) -ifndef SHARED_LIBRARY_TARGET -SHARED_LIBRARY_TARGET = target -endif -INSTALL_TARGETS += SHARED_LIBRARY -endif # SHARED_LIBRARY - ifdef WASM_LIBRARY WASM_LIBRARY_FILES = $(WASM_LIBRARY) WASM_LIBRARY_DEST ?= $(FINAL_TARGET) |