Skip to content

Commit 4211762

Browse files
committed
---
yaml --- r: 156109 b: refs/heads/auto c: b69cd73 h: refs/heads/master i: 156107: 354e346 v: v3
1 parent 96790e2 commit 4211762

File tree

5 files changed

+704
-38
lines changed

5 files changed

+704
-38
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: dd55c8003cb9c4b065e8a8e54bbc0496ac0a3dfd
16+
refs/heads/auto: b69cd73b7bd448dbfde4cf074b73a4b8384cad38
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/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)