diff options
| author | bors <bors@rust-lang.org> | 2014-10-21 08:22:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-10-21 08:22:09 +0000 |
| commit | e8cc3f26ec998181a883d79c9a668fe55695e681 (patch) | |
| tree | ab82a3a04138876479496a785700d69687816b9c | |
| parent | 2fffbe06635dcaa17ce34dcfde9a42f0aaf52be0 (diff) | |
| parent | d75ff2ff934c3c3e065ff3652db3cd27d0a09b26 (diff) | |
| download | rust-e8cc3f26ec998181a883d79c9a668fe55695e681.tar.gz rust-e8cc3f26ec998181a883d79c9a668fe55695e681.zip | |
auto merge of #18194 : jmesmon/rust/libbacktrace-env, r=alexcrichton
This was run into while attempting to integrate rust with bitbake's build system. I expect it's caused by some other environment variables being set to gcc but didn't track down the exact cause myself.
| -rw-r--r-- | mk/rt.mk | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/mk/rt.mk b/mk/rt.mk index de06d4917ee..3e050123274 100644 --- a/mk/rt.mk +++ b/mk/rt.mk @@ -284,16 +284,15 @@ endif # ./configure script. This is done to force libbacktrace to *not* use the # atomic/sync functionality because it pulls in unnecessary dependencies and we # never use it anyway. -$$(BACKTRACE_BUILD_DIR_$(1))/Makefile: \ - export CFLAGS:=$$(CFG_GCCISH_CFLAGS_$(1):-Werror=) \ - -fno-stack-protector -$$(BACKTRACE_BUILD_DIR_$(1))/Makefile: export CC:=$$(CC_$(1)) -$$(BACKTRACE_BUILD_DIR_$(1))/Makefile: export AR:=$$(AR_$(1)) -$$(BACKTRACE_BUILD_DIR_$(1))/Makefile: export RANLIB:=$$(AR_$(1)) s $$(BACKTRACE_BUILD_DIR_$(1))/Makefile: $$(BACKTRACE_DEPS) $$(MKFILE_DEPS) + @$$(call E, configure: libbacktrace for $(1)) $$(Q)rm -rf $$(BACKTRACE_BUILD_DIR_$(1)) $$(Q)mkdir -p $$(BACKTRACE_BUILD_DIR_$(1)) $$(Q)(cd $$(BACKTRACE_BUILD_DIR_$(1)) && \ + CC="$$(CC_$(1))" \ + AR="$$(AR_$(1))" \ + RANLIB="$$(AR_$(1)) s" \ + CFLAGS="$$(CFG_GCCISH_CFLAGS_$(1):-Werror=) -fno-stack-protector" \ $(S)src/libbacktrace/configure --target=$(1) --host=$(CFG_BUILD)) $$(Q)echo '#undef HAVE_ATOMIC_FUNCTIONS' >> \ $$(BACKTRACE_BUILD_DIR_$(1))/config.h |