Bug 1381043 - Enable fuller debug info for rust code on OSX cross builds. r=froydnj
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 12 Oct 2017 18:02:49 +0900
changeset 385958 95555b11aaafb46646e8c8b2f8b53ee8532f5e77
parent 385957 a3225b6f61933a483d9313667ccacffd96e3f251
child 385959 adb9c07370c6d6c7cebb1cfb2baf4cbb9c0e6b8e
push id32672
push userarchaeopteryx@coole-files.de
push dateFri, 13 Oct 2017 09:00:05 +0000
treeherdermozilla-central@3efcb26e5f37 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1381043
milestone58.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1381043 - Enable fuller debug info for rust code on OSX cross builds. r=froydnj
config/rules.mk
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -914,22 +914,17 @@ rust_unlock_unstable =
 ifdef MOZ_RUST_SIMD
 rust_unlock_unstable += RUSTC_BOOTSTRAP=1
 endif
 
 ifdef MOZ_USING_SCCACHE
 sccache_wrap := RUSTC_WRAPPER='$(CCACHE)'
 endif
 
-# XXX hack to work around dsymutil failing on cross-OSX builds (bug 1380381)
-ifeq ($(HOST_OS_ARCH)-$(OS_ARCH),Linux-Darwin)
-default_rustflags += -C debuginfo=1
-else
 default_rustflags += -C debuginfo=2
-endif
 
 # We use the + prefix to pass down the jobserver fds to cargo, but we
 # don't use the prefix when make -n is used, so that cargo doesn't run
 # in that case)
 define RUN_CARGO
 $(if $(findstring n,$(filter-out --%, $(MAKEFLAGS))),,+)env $(environment_cleaner) $(rust_unlock_unstable) $(rustflags_override) $(sccache_wrap) \
 	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) \
 	RUSTC=$(RUSTC) \