From a73c217bf6b58e361cfdc0075e98c0ad1d5457a4 Mon Sep 17 00:00:00 2001 From: Ben Gras Date: Sat, 11 Feb 2012 18:46:09 +0100 Subject: [PATCH] clang compile fixes --- commands/cut/Makefile | 5 +++++ commands/find/Makefile | 5 +++++ commands/hexdump/Makefile | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/commands/cut/Makefile b/commands/cut/Makefile index 100dad1d4..0904d61e8 100644 --- a/commands/cut/Makefile +++ b/commands/cut/Makefile @@ -3,7 +3,12 @@ PROG= cut +.if ${COMPILER_TYPE} != "gnu" LDADD+= -lminixutil DPADD+= ${LIBMINIXUTIL} +.else +LDADD+= -lutil +DPADD+= ${LIBUTIL} +.endif .include diff --git a/commands/find/Makefile b/commands/find/Makefile index 05093bf06..977d15c8f 100644 --- a/commands/find/Makefile +++ b/commands/find/Makefile @@ -6,7 +6,12 @@ PROG= find SRCS= find.c function.c ls.c main.c misc.c operator.c option.c +.if ${COMPILER_TYPE} != "gnu" LDADD+=-lminixutil DPADD+=${LIBMINIXUTIL} +.else +LDADD+= -lutil +DPADD+= ${LIBUTIL} +.endif .include diff --git a/commands/hexdump/Makefile b/commands/hexdump/Makefile index 72ddcbeac..7272f157d 100644 --- a/commands/hexdump/Makefile +++ b/commands/hexdump/Makefile @@ -6,8 +6,14 @@ SRCS= conv.c display.c hexdump.c hexsyntax.c odsyntax.c parse.c MAN= hexdump.1 #od.1 .ifndef HOSTPROG + +.if ${COMPILER_TYPE} != "gnu" LDADD+=-lminixutil DPADD+=${LIBMINIXUTIL} +.else +LDADD+= -lutil +DPADD+= ${LIBUTIL} +.endif #LINKS= ${BINDIR}/hexdump ${BINDIR}/od .endif -- 2.44.0