]> Zhao Yanbai Git Server - minix.git/commitdiff
clang compile fixes
authorBen Gras <ben@minix3.org>
Sat, 11 Feb 2012 17:46:09 +0000 (18:46 +0100)
committerBen Gras <ben@minix3.org>
Tue, 14 Feb 2012 13:05:52 +0000 (14:05 +0100)
commands/cut/Makefile
commands/find/Makefile
commands/hexdump/Makefile

index 100dad1d45a73c0f6ef6478e5a2aa15ac70a4bae..0904d61e82d5b58e141662efe2ad00b4a4efe0a2 100644 (file)
@@ -3,7 +3,12 @@
 
 PROG=  cut
 
+.if ${COMPILER_TYPE} != "gnu"
 LDADD+=        -lminixutil
 DPADD+=        ${LIBMINIXUTIL}
+.else
+LDADD+=        -lutil
+DPADD+=        ${LIBUTIL}
+.endif
 
 .include <bsd.prog.mk>
index 05093bf0638a84ec8ae6fe2a9247c6f4e6083f42..977d15c8ff32887e867690423e3f517f7d32d612 100644 (file)
@@ -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 <bsd.prog.mk>
index 72ddcbeac3eb1fb54813acb1d42f31a52a2e1270..7272f157d54a3fe3f9c885da1ff13ce87633e026 100644 (file)
@@ -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