diff options
| author | bors <bors@rust-lang.org> | 2016-03-07 00:30:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-03-07 00:30:09 +0000 |
| commit | 998a6720b68bcb0fef67daa5d258ff2f8e5b99b8 (patch) | |
| tree | 32b9bc1fb6189826d2bb4f18e1d197d13a678e62 | |
| parent | 3340cb3df9c2582a080763908ac47102b1e90a95 (diff) | |
| parent | 7fdb9fd94116bf1d46c2d23322313b0db04908a0 (diff) | |
| download | rust-998a6720b68bcb0fef67daa5d258ff2f8e5b99b8.tar.gz rust-998a6720b68bcb0fef67daa5d258ff2f8e5b99b8.zip | |
Auto merge of #32061 - infinity0:master, r=alexcrichton
Adding -Wno-error is more reliable and simple than trying to modify existing flags. We've been using this in Debian already for the past few releases. Making this change also encourages future maintainers towards "best practises". Also take the opportunity to use the same method at all places in the file.
| -rw-r--r-- | mk/rt.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/rt.mk b/mk/rt.mk index bd17490955d..5f46b3a20c9 100644 --- a/mk/rt.mk +++ b/mk/rt.mk @@ -253,7 +253,7 @@ COMPRT_AR_$(1) := $$(AR_$(1)) # We chomp -Werror here because GCC warns about the type signature of # builtins not matching its own and the build fails. It's a bit hacky, # but what can we do, we're building libclang-rt using GCC ...... -COMPRT_CFLAGS_$(1) := $$(filter-out -Werror -Werror=*,$$(CFG_GCCISH_CFLAGS_$(1))) -std=c99 +COMPRT_CFLAGS_$(1) := $$(CFG_GCCISH_CFLAGS_$(1)) -Wno-error -std=c99 # FreeBSD Clang's packaging is problematic; it doesn't copy unwind.h to # the standard include directory. This should really be in our changes to @@ -361,7 +361,7 @@ $$(BACKTRACE_BUILD_DIR_$(1))/Makefile: $$(BACKTRACE_DEPS) $$(MKFILE_DEPS) CC="$$(CC_$(1))" \ AR="$$(AR_$(1))" \ RANLIB="$$(AR_$(1)) s" \ - CFLAGS="$$(CFG_GCCISH_CFLAGS_$(1):-Werror=) -fno-stack-protector" \ + CFLAGS="$$(CFG_GCCISH_CFLAGS_$(1)) -Wno-error -fno-stack-protector" \ $(S)src/libbacktrace/configure --build=$(CFG_GNU_TRIPLE_$(CFG_BUILD)) --host=$(CFG_GNU_TRIPLE_$(1))) $$(Q)echo '#undef HAVE_ATOMIC_FUNCTIONS' >> \ $$(BACKTRACE_BUILD_DIR_$(1))/config.h |