diff options
| author | Cody P Schafer <dev@codyps.com> | 2014-10-20 14:04:45 -0400 |
|---|---|---|
| committer | Cody P Schafer <dev@codyps.com> | 2014-10-20 15:35:38 -0400 |
| commit | d75ff2ff934c3c3e065ff3652db3cd27d0a09b26 (patch) | |
| tree | 1bce25f5d5e41b7709f6fd6f9b2f01b0fc5643c0 | |
| parent | 7d0cc44f873ac338b400b20bcb62618aa5d36b70 (diff) | |
| download | rust-d75ff2ff934c3c3e065ff3652db3cd27d0a09b26.tar.gz rust-d75ff2ff934c3c3e065ff3652db3cd27d0a09b26.zip | |
mk/rt: "export CC" does not seem to work (gcc observed), use explicit shell variables instead
| -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 |