diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | conform/Makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 10872855b6..1153c53ec4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2018-11-09 Joseph Myers <joseph@codesourcery.com> + * conform/Makefile ($(conformtest-header-tests)): Create $(@D), + not $(@D)/scratch. + ($(linknamespace-header-tests)): Likewise. + * conform/conformtest.py: New file. * conform/conformtest.pl: Remove. * conform/GlibcConform.pm: Likewise. diff --git a/conform/Makefile b/conform/Makefile index a428fbf937..5f9b480e79 100644 --- a/conform/Makefile +++ b/conform/Makefile @@ -174,7 +174,7 @@ endif $(conformtest-header-tests): $(objpfx)%/conform.out: \ conformtest.py $(conformtest-headers-data) (set -e; std_hdr=$*; std=$${std_hdr%%/*}; hdr=$${std_hdr#*/}; \ - mkdir -p $(@D)/scratch; \ + mkdir -p $(@D); \ $(PYTHON) $< --cc='$(CC)' --flags='$(conformtest-cc-flags)' \ --standard=$$std --header=$$hdr $(conformtest-xfail) \ $(conformtest-cross) \ @@ -222,7 +222,7 @@ $(linknamespace-header-tests): $(objpfx)%/linknamespace.out: \ $(linknamespace-symlists-tests) \ $(linknamespace-symlist-stdlibs-tests) (set -e; std_hdr=$*; std=$${std_hdr%%/*}; hdr=$${std_hdr#*/}; \ - mkdir -p $(@D)/scratch; \ + mkdir -p $(@D); \ $(PYTHON) $< --cc='$(CC)' --flags='$(conformtest-cc-flags)' \ --standard=$$std --stdsyms=$(objpfx)symlist-$$std \ --header=$$hdr --libsyms=$(objpfx)symlist-stdlibs-$$std \ |