Bug 1381043 - Enable fuller debug info for rust code on OSX cross builds. r?froydnj draft
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 12 Oct 2017 18:02:49 +0900
changeset 679011 8b8b77b09a83c89d849e52ec430b2ad89797eae5
parent 679010 bbbc7a7c2c1f7a00b3eab67f87da176081ff8f5f
child 735506 0e4934ebc169de8412b7de9797ec6b5af2350516
push id84115
push userbmo:mh+mozilla@glandium.org
push dateThu, 12 Oct 2017 09:06:02 +0000
reviewersfroydnj
bugs1381043
milestone58.0a1
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) \