diff options
| author | Tim Foster <tim.foster@joyent.com> | 2019-08-23 13:17:29 +0100 |
|---|---|---|
| committer | Tim Foster <tim.foster@joyent.com> | 2019-08-23 12:19:06 +0000 |
| commit | f0e88e824573addb114d76d4bb019113c7c2d445 (patch) | |
| tree | 9b1f2ce961ca72d4561fc91311ff0f2fec9c953d | |
| parent | e1f899e662705332b04ab8dc6b21c28e54621d88 (diff) | |
| download | illumos-joyent-f0e88e824573addb114d76d4bb019113c7c2d445.tar.gz | |
OS-7967 unable to build vtfontcvt on older PIs due to queue.h changes
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Approved by: Jerry Jelinek <jerry.jelinek@joyent.com>
| -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 |