Date: Tue, 31 Mar 1998 20:30:02 -0800 (PST) From: Brian Cully <shmit@erols.com> To: freebsd-bugs Subject: bin/6178 Message-ID: <199804010430.UAA07304@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR bin/6178; it has been noted by GNATS.
From: Brian Cully <shmit@erols.com>
To: gnats@freebsd.org
Cc: Subject: bin/6178
Date: Tue, 31 Mar 1998 17:38:31 -0500
The patches I sent before weren't quite right. They broke things that
didn't have $SRCS defined. These work fine.
-bjc
diff -cr mk.orig/bsd.dep.mk mk/bsd.dep.mk
*** mk.orig/bsd.dep.mk Mon Mar 30 14:15:48 1998
--- mk/bsd.dep.mk Mon Mar 30 15:37:24 1998
***************
*** 55,60 ****
--- 55,65 ----
${CXXFLAGS:M-nostdinc*} ${CXXFLAGS:M-[BID]*} \
${.ALLSRC:M*.cc} ${.ALLSRC:M*.C} ${.ALLSRC:M*.cxx}
.endif
+ .if ${SRCS:M*.m} != ""
+ ${MKDEPCMD} -f ${DEPENDFILE} -a ${MKDEP} \
+ ${OBJCFLAGS:M-nostdinc*} ${OBJCFLAGS:M-[BID]*} \
+ ${OBJCFLAGS:M-Wno-import*} ${.ALLSRC:M*.m}
+ .endif
.if target(_EXTRADEPEND)
cd ${.CURDIR}; ${MAKE} _EXTRADEPEND
.endif
diff -cr mk.orig/bsd.lib.mk mk/bsd.lib.mk
*** mk.orig/bsd.lib.mk Mon Mar 30 14:15:48 1998
--- mk/bsd.lib.mk Mon Mar 30 15:43:06 1998
***************
*** 27,32 ****
--- 27,35 ----
.if defined(DESTDIR)
CFLAGS+= -I${DESTDIR}/usr/include
CXXINCLUDES+= -I${DESTDIR}/usr/include/g++
+ OBJCINCLUDES+= -I${DESTDIR}/usr/include/objc
+ .else
+ OBJCINCLUDES+= -I/usr/include/objc
.endif
.if defined(DEBUG_FLAGS)
***************
*** 70,75 ****
--- 73,90 ----
.cc.so .C.so .cxx.so:
${CXX} ${PICFLAG} -DPIC ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET}
+ @${LD} -O ${.TARGET} -x -r ${.TARGET}
+
+ .m.o:
+ ${OBJC} ${OBJCFLAGS} -c ${.IMPSRC} -o ${.TARGET}
+ @${LD} -O ${.TARGET} -x -r ${.TARGET}
+
+ .m.po:
+ ${OBJC} -pg ${OBJCFLAGS} -c ${.IMPSRC} -o ${.TARGET}
+ @${LD} -O ${.TARGET} -X -r ${.TARGET}
+
+ .m.so:
+ ${OBJC} ${OBJCFLAGS} -DPIC ${OBJCFLAGS} -c ${.IMPSRC} -o ${.TARGET}
@${LD} -O ${.TARGET} -x -r ${.TARGET}
.f.o:
diff -cr mk.orig/bsd.libnames.mk mk/bsd.libnames.mk
*** mk.orig/bsd.libnames.mk Mon Mar 30 14:15:48 1998
--- mk/bsd.libnames.mk Mon Mar 30 15:40:56 1998
***************
*** 43,48 ****
--- 43,49 ----
LIBMYTINFO?= ${DESTDIR}/usr/lib/libmytinfo.a
LIBNCURSES?= ${DESTDIR}/usr/lib/libncurses.a
LIBOPIE?= ${DESTDIR}/usr/lib/libopie.a
+ LIBOBJC?= ${DESTDIR}/usr/lib/libobjc.a
LIBPC?= ${DESTDIR}/usr/lib/libpc.a # XXX doesn't exist
LIBPCAP?= ${DESTDIR}/usr/lib/libpcap.a
LIBPLOT?= ${DESTDIR}/usr/lib/libplot.a # XXX doesn't exist
diff -cr mk.orig/bsd.prog.mk mk/bsd.prog.mk
*** mk.orig/bsd.prog.mk Mon Mar 30 14:15:48 1998
--- mk/bsd.prog.mk Tue Mar 31 14:10:39 1998
***************
*** 8,19 ****
# Default executable format
BINFORMAT?= aout
! .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S
CFLAGS+=${COPTS} ${DEBUG_FLAGS}
.if defined(DESTDIR)
CFLAGS+= -I${DESTDIR}/usr/include
CXXINCLUDES+= -I${DESTDIR}/usr/include/g++
.endif
.if !defined(DEBUG_FLAGS)
--- 8,22 ----
# Default executable format
BINFORMAT?= aout
! .SUFFIXES: .out .o .c .cc .cxx .m .C .y .l .s .S
CFLAGS+=${COPTS} ${DEBUG_FLAGS}
.if defined(DESTDIR)
CFLAGS+= -I${DESTDIR}/usr/include
CXXINCLUDES+= -I${DESTDIR}/usr/include/g++
+ OBJCINCLUDES+= -I${DESTDIR}/usr/include/objc
+ .else
+ OBJCINCLUDES+= -I/usr/include/objc
.endif
.if !defined(DEBUG_FLAGS)
***************
*** 26,31 ****
--- 29,39 ----
.if defined(PROG)
.if defined(SRCS)
+
+ # If Objective C sources are included, make sure we link with -lobjc.
+ .if ${SRCS:M*.m} != ""
+ LDADD+= -lobjc
+ .endif
OBJS+= ${SRCS:N*.h:R:S/$/.o/g}
diff -cr mk.orig/sys.mk mk/sys.mk
*** mk.orig/sys.mk Mon Mar 30 14:15:48 1998
--- mk/sys.mk Mon Mar 30 15:38:00 1998
***************
*** 15,21 ****
.if defined(%POSIX)
.SUFFIXES: .o .c .y .l .a .sh .f
.else
! .SUFFIXES: .out .a .ln .o .c .cc .cxx .C .F .f .e .r .y .l .S .s .cl .p .h .sh
.endif
.LIBS: .a
--- 15,21 ----
.if defined(%POSIX)
.SUFFIXES: .o .c .y .l .a .sh .f
.else
! .SUFFIXES: .out .a .ln .o .c .cc .cxx .m .C .F .f .e .r .y .l .S .s .cl .p .h .sh
.endif
.LIBS: .a
***************
*** 43,48 ****
--- 43,51 ----
CXX ?= c++
CXXFLAGS ?= ${CXXINCLUDES} ${CFLAGS}
+ OBJC ?= cc
+ OBJCFLAGS ?= ${OBJCINCLUDES} ${CFLAGS} -Wno-import
+
CPP ?= cpp
.if ${.MAKEFLAGS:M-s} == ""
***************
*** 184,189 ****
--- 187,195 ----
.cc.o .cxx.o .C.o:
${CXX} ${CXXFLAGS} -c ${.IMPSRC}
+
+ .m.o:
+ ${OBJC} ${OBJCFLAGS} -c ${.IMPSRC}
.p.o:
${PC} ${PFLAGS} -c ${.IMPSRC}
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199804010430.UAA07304>