mirror of
https://github.com/freebsd/freebsd-src
synced 2024-11-05 18:22:52 +00:00
Fix the libkern references to hopefully DTRT. See comments regarding
a slight change in how profiled version is selected - may need to adjust some .mk macros if PROF is foolishly initialized anywhere to a null value. Submitted by: jkh
This commit is contained in:
Jordan K. Hubbard
parent
b6cedfa8ad
commit
84fb67c981
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=2232
3 changed files with 63 additions and 21 deletions
|
|
@ -1,6 +1,6 @@
|
||||||
# Copyright 1990 W. Jolitz
|
# Copyright 1990 W. Jolitz
|
||||||
# from: @(#)Makefile.i386 7.1 5/10/91
|
# from: @(#)Makefile.i386 7.1 5/10/91
|
||||||
# $Id: Makefile.i386,v 1.28 1994/08/13 03:49:32 wollman Exp $
|
# $Id: Makefile.i386,v 1.29 1994/08/18 22:34:36 wollman Exp $
|
||||||
#
|
#
|
||||||
# Makefile for FreeBSD
|
# Makefile for FreeBSD
|
||||||
#
|
#
|
||||||
|
|
@ -76,12 +76,26 @@ PROFILE_C= ${CC} -S -c ${CFLAGS} $< ; \
|
||||||
|
|
||||||
%LOAD
|
%LOAD
|
||||||
|
|
||||||
libkern.a:
|
# This is slightly different from before in that if you define PROF
|
||||||
-@if [ X${PROF} = X ]; \
|
# to anything, it will assume profiling. Don't do "PROF=" to turn
|
||||||
then ln -s $S/libkern/obj/libkern.a libkern.a; \
|
# profiling off!
|
||||||
else ln -s $S/libkern/obj/libkern_p.a libkern.a; \
|
.if exists($S/libkern/obj)
|
||||||
fi; \
|
LIBKERNP=$S/libkern/obj
|
||||||
echo ln -s $S/libkern/obj/libkern.a libkern.a
|
.else
|
||||||
|
LIBKERNP=$S/libkern
|
||||||
|
.fi
|
||||||
|
.if defined(PROF)
|
||||||
|
LIBKERN=${LIBKERNP}/libkern_p.a
|
||||||
|
.else
|
||||||
|
LIBKERN=${LIBKERNP}/libkern.a
|
||||||
|
.fi
|
||||||
|
|
||||||
|
libkern.a: ${LIBKERN}
|
||||||
|
ln -s ${LIBKERN} libkern.a
|
||||||
|
echo ln -s ${LIBKERN} libkern.a
|
||||||
|
|
||||||
|
${LIBKERN}:
|
||||||
|
@(cd $S/libkern; make)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f eddep *kernel tags *.o locore.i [a-uw-z]*.s \
|
rm -f eddep *kernel tags *.o locore.i [a-uw-z]*.s \
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# Copyright 1990 W. Jolitz
|
# Copyright 1990 W. Jolitz
|
||||||
# from: @(#)Makefile.i386 7.1 5/10/91
|
# from: @(#)Makefile.i386 7.1 5/10/91
|
||||||
# $Id: Makefile.i386,v 1.28 1994/08/13 03:49:32 wollman Exp $
|
# $Id: Makefile.i386,v 1.29 1994/08/18 22:34:36 wollman Exp $
|
||||||
#
|
#
|
||||||
# Makefile for FreeBSD
|
# Makefile for FreeBSD
|
||||||
#
|
#
|
||||||
|
|
@ -76,12 +76,26 @@ PROFILE_C= ${CC} -S -c ${CFLAGS} $< ; \
|
||||||
|
|
||||||
%LOAD
|
%LOAD
|
||||||
|
|
||||||
libkern.a:
|
# This is slightly different from before in that if you define PROF
|
||||||
-@if [ X${PROF} = X ]; \
|
# to anything, it will assume profiling. Don't do "PROF=" to turn
|
||||||
then ln -s $S/libkern/obj/libkern.a libkern.a; \
|
# profiling off!
|
||||||
else ln -s $S/libkern/obj/libkern_p.a libkern.a; \
|
.if exists($S/libkern/obj)
|
||||||
fi; \
|
LIBKERNP=$S/libkern/obj
|
||||||
echo ln -s $S/libkern/obj/libkern.a libkern.a
|
.else
|
||||||
|
LIBKERNP=$S/libkern
|
||||||
|
.fi
|
||||||
|
.if defined(PROF)
|
||||||
|
LIBKERN=${LIBKERNP}/libkern_p.a
|
||||||
|
.else
|
||||||
|
LIBKERN=${LIBKERNP}/libkern.a
|
||||||
|
.fi
|
||||||
|
|
||||||
|
libkern.a: ${LIBKERN}
|
||||||
|
ln -s ${LIBKERN} libkern.a
|
||||||
|
echo ln -s ${LIBKERN} libkern.a
|
||||||
|
|
||||||
|
${LIBKERN}:
|
||||||
|
@(cd $S/libkern; make)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f eddep *kernel tags *.o locore.i [a-uw-z]*.s \
|
rm -f eddep *kernel tags *.o locore.i [a-uw-z]*.s \
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# Copyright 1990 W. Jolitz
|
# Copyright 1990 W. Jolitz
|
||||||
# from: @(#)Makefile.i386 7.1 5/10/91
|
# from: @(#)Makefile.i386 7.1 5/10/91
|
||||||
# $Id: Makefile.i386,v 1.28 1994/08/13 03:49:32 wollman Exp $
|
# $Id: Makefile.i386,v 1.29 1994/08/18 22:34:36 wollman Exp $
|
||||||
#
|
#
|
||||||
# Makefile for FreeBSD
|
# Makefile for FreeBSD
|
||||||
#
|
#
|
||||||
|
|
@ -76,12 +76,26 @@ PROFILE_C= ${CC} -S -c ${CFLAGS} $< ; \
|
||||||
|
|
||||||
%LOAD
|
%LOAD
|
||||||
|
|
||||||
libkern.a:
|
# This is slightly different from before in that if you define PROF
|
||||||
-@if [ X${PROF} = X ]; \
|
# to anything, it will assume profiling. Don't do "PROF=" to turn
|
||||||
then ln -s $S/libkern/obj/libkern.a libkern.a; \
|
# profiling off!
|
||||||
else ln -s $S/libkern/obj/libkern_p.a libkern.a; \
|
.if exists($S/libkern/obj)
|
||||||
fi; \
|
LIBKERNP=$S/libkern/obj
|
||||||
echo ln -s $S/libkern/obj/libkern.a libkern.a
|
.else
|
||||||
|
LIBKERNP=$S/libkern
|
||||||
|
.fi
|
||||||
|
.if defined(PROF)
|
||||||
|
LIBKERN=${LIBKERNP}/libkern_p.a
|
||||||
|
.else
|
||||||
|
LIBKERN=${LIBKERNP}/libkern.a
|
||||||
|
.fi
|
||||||
|
|
||||||
|
libkern.a: ${LIBKERN}
|
||||||
|
ln -s ${LIBKERN} libkern.a
|
||||||
|
echo ln -s ${LIBKERN} libkern.a
|
||||||
|
|
||||||
|
${LIBKERN}:
|
||||||
|
@(cd $S/libkern; make)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f eddep *kernel tags *.o locore.i [a-uw-z]*.s \
|
rm -f eddep *kernel tags *.o locore.i [a-uw-z]*.s \
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue