bug 1305731 - Revert workaround from bug 1301751 now that we have upd…

…ated to Rust 1.12. r=froydnj MozReview-Commit-ID: 3akbELExfKT
iaxat · Oct 17, 2016 · 09b486c · 09b486c
1 parent de3f5ef
commit 09b486c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 16 deletions.
diff --git a/config/rules.mk b/config/rules.mk
@@ -918,12 +918,9 @@ cargo_build_flags += --verbose
 # We need to run cargo unconditionally, because cargo is the only thing that
 # has full visibility into how changes in Rust sources might affect the final
 # build.
-#
-# XXX: We're passing `-C debuginfo=1` to rustc to work around an llvm-dsymutil
-# crash (bug 1301751). This should be temporary until we upgrade to Rust 1.12.
 force-cargo-build:
 	$(REPORT_BUILD)
-	env CARGO_TARGET_DIR=. RUSTC=$(RUSTC) RUSTFLAGS='-C debuginfo=1' $(CARGO) build $(cargo_build_flags) --
+	env CARGO_TARGET_DIR=. RUSTC=$(RUSTC) $(CARGO) build $(cargo_build_flags) --
 
 $(RUST_LIBRARY_FILE): force-cargo-build
 endif # CARGO_FILE

diff --git a/toolkit/library/gtest/rust/Cargo.toml b/toolkit/library/gtest/rust/Cargo.toml
@@ -23,11 +23,7 @@ harness = false
 # Explicitly specify what our profiles use.
 [profile.dev]
 opt-level = 1
-# XXX: We're passing `-C debuginfo=1` to rustc to work around an llvm-dsymutil
-# crash (bug 1301751), but rustc can't handle -g with that option, so
-# turn off debug for now.
-# This should be temporary until we upgrade to Rust 1.12.
-debug = false
+debug = true
 rpath = false
 lto = false
 debug-assertions = true
@@ -36,7 +32,7 @@ panic = "abort"
 
 [profile.release]
 opt-level = 2
-debug = false
+debug = true
 rpath = false
 # This would normally be 'true' for release configurations, but using LTO on
 # rul-gtest causes link failures due to symbols also being found in libxul's

diff --git a/toolkit/library/rust/Cargo.toml b/toolkit/library/rust/Cargo.toml
@@ -21,11 +21,7 @@ harness = false
 # Explicitly specify what our profiles use.
 [profile.dev]
 opt-level = 1
-# XXX: We're passing `-C debuginfo=1` to rustc to work around an llvm-dsymutil
-# crash (bug 1301751), but rustc can't handle -g with that option, so
-# turn off debug for now.
-# This should be temporary until we upgrade to Rust 1.12.
-debug = false
+debug = true
 rpath = false
 lto = false
 debug-assertions = true
@@ -34,7 +30,7 @@ panic = "abort"
 
 [profile.release]
 opt-level = 2
-debug = false
+debug = true
 rpath = false
 lto = true
 debug-assertions = false