Skip to content

Commit 9069d64

Browse files
committed
---
yaml --- r: 6168 b: refs/heads/master c: e7afe11 h: refs/heads/master v: v3
1 parent 8cee295 commit 9069d64

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: c0d220362fb1a09f4e2a9e0f98e74a01bf568ba5
2+
refs/heads/master: e7afe11a2a9e1480862bdfc3ead3dbc02938fc0a

trunk/mk/llvm.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ifeq ($(CFG_LLVM_ROOT),)
99

1010
$$(LLVM_CONFIG_$(1)): $$(LLVM_DEPS_$(1))
1111
@$$(call E, make: llvm)
12-
$$(Q)$$(MAKE) -C $$(CFG_LLVM_BUILD_DIR_$(1))
12+
$$(Q)$$(MAKE) -C $$(CFG_LLVM_BUILD_DIR_$(1)) $$(CFG_LLVM_BUILD_ENV)
1313

1414
endif
1515

trunk/mk/platform.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ ifneq ($(findstring linux,$(CFG_OSTYPE)),)
6464
endif
6565
endif
6666
CFG_INSTALL_NAME =
67+
# Linux requires LLVM to be built like this to get backtraces into Rust code
68+
CFG_LLVM_BUILD_ENV="CXXFLAGS=-fno-omit-frame-pointer"
6769
endif
6870

6971
ifneq ($(findstring darwin,$(CFG_OSTYPE)),)

0 commit comments

Comments
 (0)