Skip to content

Commit

Permalink
Remove duplicate make wildcard rule
Browse files Browse the repository at this point in the history
This change will help ensure `make check` downloads files correctly.
  • Loading branch information
jart committed Apr 27, 2023
1 parent 825617e commit 14024b7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
5 changes: 0 additions & 5 deletions test/test.mk
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,6 @@ o/$(MODE)/%.runs: o/$(MODE)/%
$<
@touch $@

o/$(MODE)/%.ok: % o/$(MODE)/blink/blink
@mkdir -p $(@D)
o/$(MODE)/blink/blink $<
@touch $@

o/$(MODE)/i486/%.runs: o/$(MODE)/i486/% o/third_party/qemu/4/qemu-i386 $(VM)
$(VM) o/third_party/qemu/4/qemu-i386 $<
@touch $@
Expand Down
7 changes: 5 additions & 2 deletions third_party/cosmo/cosmo.mk
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,14 @@ third_party/cosmo/%.com.dbg: third_party/cosmo/%.com.dbg.gz
chmod +x $@

.PRECIOUS: third_party/cosmo/%.com
third_party/cosmo/%.com: third_party/cosmo/%.com.gz third_party/cosmo/%.com.dbg
third_party/cosmo/%.com: third_party/cosmo/%.com.gz
gzip -dc <$< >$@
chmod +x $@

o/$(MODE)/third_party/cosmo/%.com.ok: third_party/cosmo/%.com o/$(MODE)/blink/blink $(VM)
o/$(MODE)/third_party/cosmo/%.com.ok: \
third_party/cosmo/%.com \
third_party/cosmo/%.com.dbg \
o/$(MODE)/blink/blink $(VM)
@mkdir -p $(@D)
o/$(MODE)/blink/blink $<
@touch $@
Expand Down

0 comments on commit 14024b7

Please sign in to comment.