Skip to content

Commit b1dd017

Browse files
committed
---
yaml --- r: 156469 b: refs/heads/snap-stage3 c: d75ff2f h: refs/heads/master i: 156467: b8c31f0 v: v3
1 parent 48e94cf commit b1dd017

File tree

6 files changed

+39
-707
lines changed

6 files changed

+39
-707
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: c29a7520e7fb4a5b4d4eccfc594e05793ef6688d
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 2fffbe06635dcaa17ce34dcfde9a42f0aaf52be0
4+
refs/heads/snap-stage3: d75ff2ff934c3c3e065ff3652db3cd27d0a09b26
55
refs/heads/try: 6601b0501e31d08d3892a2d5a7d8a57ab120bf75
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/mk/rt.mk

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -284,16 +284,15 @@ endif
284284
# ./configure script. This is done to force libbacktrace to *not* use the
285285
# atomic/sync functionality because it pulls in unnecessary dependencies and we
286286
# never use it anyway.
287-
$$(BACKTRACE_BUILD_DIR_$(1))/Makefile: \
288-
export CFLAGS:=$$(CFG_GCCISH_CFLAGS_$(1):-Werror=) \
289-
-fno-stack-protector
290-
$$(BACKTRACE_BUILD_DIR_$(1))/Makefile: export CC:=$$(CC_$(1))
291-
$$(BACKTRACE_BUILD_DIR_$(1))/Makefile: export AR:=$$(AR_$(1))
292-
$$(BACKTRACE_BUILD_DIR_$(1))/Makefile: export RANLIB:=$$(AR_$(1)) s
293287
$$(BACKTRACE_BUILD_DIR_$(1))/Makefile: $$(BACKTRACE_DEPS) $$(MKFILE_DEPS)
288+
@$$(call E, configure: libbacktrace for $(1))
294289
$$(Q)rm -rf $$(BACKTRACE_BUILD_DIR_$(1))
295290
$$(Q)mkdir -p $$(BACKTRACE_BUILD_DIR_$(1))
296291
$$(Q)(cd $$(BACKTRACE_BUILD_DIR_$(1)) && \
292+
CC="$$(CC_$(1))" \
293+
AR="$$(AR_$(1))" \
294+
RANLIB="$$(AR_$(1)) s" \
295+
CFLAGS="$$(CFG_GCCISH_CFLAGS_$(1):-Werror=) -fno-stack-protector" \
297296
$(S)src/libbacktrace/configure --target=$(1) --host=$(CFG_BUILD))
298297
$$(Q)echo '#undef HAVE_ATOMIC_FUNCTIONS' >> \
299298
$$(BACKTRACE_BUILD_DIR_$(1))/config.h

0 commit comments

Comments
 (0)