about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2011-11-03 16:13:22 -0700
committerBrian Anderson <banderson@mozilla.com>2011-11-05 13:23:11 -0700
commite7afe11a2a9e1480862bdfc3ead3dbc02938fc0a (patch)
tree026e408b4f1ee4d25644956184371050acb49c42
parentc0d220362fb1a09f4e2a9e0f98e74a01bf568ba5 (diff)
downloadrust-e7afe11a2a9e1480862bdfc3ead3dbc02938fc0a.tar.gz
rust-e7afe11a2a9e1480862bdfc3ead3dbc02938fc0a.zip
Build LLVM with -fno-omit-frame-pointer on Linux
-rw-r--r--mk/llvm.mk2
-rw-r--r--mk/platform.mk2
2 files changed, 3 insertions, 1 deletions
diff --git a/mk/llvm.mk b/mk/llvm.mk
index 104fcb01f78..4a575b27ce1 100644
--- a/mk/llvm.mk
+++ b/mk/llvm.mk
@@ -9,7 +9,7 @@ ifeq ($(CFG_LLVM_ROOT),)
 
 $$(LLVM_CONFIG_$(1)): $$(LLVM_DEPS_$(1))
 	@$$(call E, make: llvm)
-	$$(Q)$$(MAKE) -C $$(CFG_LLVM_BUILD_DIR_$(1))
+	$$(Q)$$(MAKE) -C $$(CFG_LLVM_BUILD_DIR_$(1)) $$(CFG_LLVM_BUILD_ENV)
 
 endif
 
diff --git a/mk/platform.mk b/mk/platform.mk
index f1dfd824e1e..a2bdc19a0de 100644
--- a/mk/platform.mk
+++ b/mk/platform.mk
@@ -64,6 +64,8 @@ ifneq ($(findstring linux,$(CFG_OSTYPE)),)
     endif
   endif
   CFG_INSTALL_NAME =
+  # Linux requires LLVM to be built like this to get backtraces into Rust code
+  CFG_LLVM_BUILD_ENV="CXXFLAGS=-fno-omit-frame-pointer"
 endif
 
 ifneq ($(findstring darwin,$(CFG_OSTYPE)),)