diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2020-06-11 19:51:19 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2020-06-11 21:20:36 -0700 |
| commit | cde81af423951d85f0b145c473b706f72609c74e (patch) | |
| tree | 3adc2e2f5114dbb93f9fe9735a8f282497b62598 | |
| parent | 648af95332dc851db83aecc053c56aa2d4695e7c (diff) | |
| download | platform_build_kati-cde81af423951d85f0b145c473b706f72609c74e.tar.gz platform_build_kati-cde81af423951d85f0b145c473b706f72609c74e.tar.bz2 platform_build_kati-cde81af423951d85f0b145c473b706f72609c74e.zip | |
Fix regen_filefunc_read testcase under Make 4.1
Make 4.1 supports the $(file) function, but not the '<' operator to read
files, so it errors out. Make 3.82 just ignored the $(file), which was
fine in this testcase. Do that via an ifdef.
Change-Id: Ic4f8d9904cab5160f8156609ce372bb3ebb06241
| -rwxr-xr-x | testcase/ninja_regen_filefunc_read.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/testcase/ninja_regen_filefunc_read.sh b/testcase/ninja_regen_filefunc_read.sh index 7fc3a9f..01fb7e6 100755 --- a/testcase/ninja_regen_filefunc_read.sh +++ b/testcase/ninja_regen_filefunc_read.sh @@ -26,7 +26,11 @@ sleep_if_necessary() { } cat <<EOF > Makefile +# Make 4.1 does not support file reading, which was added in 4.2 +# We don't actually care though, since we're just testing kati's regen +ifdef KATI A := \$(file <file_a) +endif all: echo foo EOF |