diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | conform/Makefile | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 7264a9d427..fc8c2e4f7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2017-04-18 Joseph Myers <joseph@codesourcery.com> + * conform/Makefile (tests-special): Do not make addition of + $(conformtest-header-tests) conditional on [$(cross-compiling) = no]. + (generated): Do not make addition of $(conformtest-header-base) + conditional on [$(cross-compiling) = no]. + [BZ #21267] * sysdeps/unix/sysv/linux/bits/socket.h (IOCSIZE_MASK): Undefine if defined by <asm/socket.h> and not previously defined. diff --git a/conform/Makefile b/conform/Makefile index eb2288f144..9638ddaa5a 100644 --- a/conform/Makefile +++ b/conform/Makefile @@ -112,11 +112,9 @@ conformtest-header-base := $(foreach std,\ $(std)/$(h)/conform.out)) conformtest-header-tests := $(addprefix $(objpfx),$(conformtest-header-base)) ifneq (yes,$(fast-check)) -ifeq (no,$(cross-compiling)) tests-special += $(conformtest-header-tests) generated += $(conformtest-header-base) endif -endif linknamespace-symlists-base := $(foreach std,$(conformtest-standards),\ symlist-$(std)) |