diff options
| author | bors <bors@rust-lang.org> | 2016-02-05 08:54:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-02-05 08:54:46 +0000 |
| commit | 06fac8298f9c5c0d7cb91b4fcc15170e12169142 (patch) | |
| tree | 445bdea764ad908f495941d1b86f16f3bdb04c26 | |
| parent | 2ad6dc2556c19f49280b561fc1f5246ff9f9d6ed (diff) | |
| parent | e9dfc94d263eeb7c4ce25a50619cc2e0cdc32b66 (diff) | |
Auto merge of #31388 - gmbonnet:compiler-rt-werror, r=alexcrichton
Without this patch, `compiler-rt` fails to build when the `CFLAGS` environment variable contains a `-Werror=*` flag (for example `-Werror=format-security`). The build system was removing only the `-Werror` part from the flag, thus passing an unrecognized `=*` (for example `=format-security`) argument to gcc.
| -rw-r--r-- | mk/rt.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mk/rt.mk b/mk/rt.mk index 9dbbcbebb97..14b8abb12b8 100644 --- a/mk/rt.mk +++ b/mk/rt.mk @@ -245,7 +245,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) := $$(subst -Werror,,$$(CFG_GCCISH_CFLAGS_$(1))) -std=c99 +COMPRT_CFLAGS_$(1) := $$(filter-out -Werror -Werror=*,$$(CFG_GCCISH_CFLAGS_$(1))) -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 |