head	1.2;
access;
symbols;
locks; strict;
comment	@# @;


1.2
date	2020.09.05.02.49.27;	author pgoyette;	state dead;
branches;
next	1.1;
commitid	VdcDdheui9e5XNmC;

1.1
date	2020.09.03.20.22.26;	author ryoon;	state Exp;
branches;
next	;
commitid	BEloAFUUirJLQDmC;


desc
@@


1.2
log
@Remove a .orig file that was mistakenly committed.  OK ryoon@@
@
text
@$NetBSD: patch-config_makefiles_rust.mk.orig,v 1.1 2020/09/03 20:22:26 ryoon Exp $

NetBSD<10 doesn't get along with parallel rust builds (it causes issues
with ld.so) which are the default. Force -j1.

Set -Cembed-bitcode=yes when using LTO to fix build with rust >= 1.45.
Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1640982

--- config/makefiles/rust.mk.orig	2020-07-20 21:02:39.000000000 +0000
+++ config/makefiles/rust.mk
@@@@ -49,11 +49,19 @@@@ ifndef MOZ_DEBUG_RUST
 # Enable link-time optimization for release builds.
 cargo_rustc_flags += -C lto
 endif
+# Versions of rust >= 1.45 need -Cembed-bitcode=yes for all crates when
+# using -Clto.
+ifeq (,$(filter 1.38.% 1.39.% 1.40.% 1.41.% 1.42.% 1.43.% 1.44.%,$(RUSTC_VERSION)))
+RUSTFLAGS += -Cembed-bitcode=yes
+endif
 endif
 
 ifdef CARGO_INCREMENTAL
 export CARGO_INCREMENTAL
 endif
+ifeq ($(OS_ARCH),NetBSD)
+cargo_build_flags += -j1
+endif
 
 rustflags_neon =
 ifeq (neon,$(MOZ_FPU))
@


1.1
log
@mail/thunderbird68: import thunderbird68-68.12.0

Thunderbird is a free email, news, and chat application with support for
add-ons, derived from the Mozilla Firefox web browser.
@
text
@d1 1
a1 1
$NetBSD: patch-config_makefiles_rust.mk,v 1.1 2020/08/22 23:12:51 wiz Exp $
@