diff options
| author | Tim Foster <tim.foster@joyent.com> | 2019-08-22 13:54:44 +0100 |
|---|---|---|
| committer | Tim Foster <tim.foster@joyent.com> | 2019-08-22 15:22:38 +0100 |
| commit | 35b882851ca56bf4804249636d2058d57eee436b (patch) | |
| tree | ca0b6d3c06e7f6579569cc27f5fd642966d08aed | |
| parent | 4ad9cc07d7a3af5dbe729bd2da31e2919a64a691 (diff) | |
| download | illumos-joyent-grr-OS-7967.tar.gz | |
OS-7967 unable to build vtfontcvt on older PIs due to queue.h changesgrr-OS-7967
| -rw-r--r-- | usr/src/tools/vtfontcvt/Makefile | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/usr/src/tools/vtfontcvt/Makefile b/usr/src/tools/vtfontcvt/Makefile index b8caefdb90..39c368b9a1 100644 --- a/usr/src/tools/vtfontcvt/Makefile +++ b/usr/src/tools/vtfontcvt/Makefile @@ -11,6 +11,7 @@ # # Copyright 2017 Toomas Soome <tsoome@me.com> +# Copyright 2019 Joyent, Inc. # CMDDIR= $(SRC)/cmd/vtfontcvt @@ -31,7 +32,13 @@ $(PROG): $(OBJS) $(LINK.c) $(OBJS) -o $@ $(LDLIBS) $(POST_PROCESS) +# +# In order to build on older platforms, we specifically use the +# source-tree version of queue.h. When building as part of +# $SRC/cmd, we'll be using the $PROTO copy of queue.h anyway, +# so this is a $SRC/tools workaround only. +# %.o: $(CMDDIR)/%.c - $(COMPILE.c) -o $@ $< + $(COMPILE.c) -I$(SRC)/uts/common -o $@ $< include ../Makefile.targ |