Loading...
--- Libc/Libc-583/Makefile.xbs
+++ Libc/Libc-498/Makefile.xbs
@@ -19,14 +19,14 @@
# should only be installed once as well. Both of these get done when
# we're invoked as "Libc".
-MYBSDMAKE = ${BSDMAKE} -f Makefile
+BSDMAKE = bsdmake -f Makefile
.PATH: .
.MAIN: all
all: libc.a libc_static.a libc_debug.a libc_profile.a
-install: ${SYMROOTINC}/${MACHINE_ARCH}/libc-features.h installhdrs install_libc.a \
+install: installhdrs install_libc.a install_libc_static.a \
install_libc_profile.a install_libc_debug.a \
- maninstall
+ autopatchman maninstall
.SUFFIXES:
.SUFFIXES: .o .po .So .do
@@ -35,7 +35,6 @@
.SUFFIXES: .f .y .l .defs .h
.SUFFIXES: User.c User.o User.po User.So User.do
.SUFFIXES: Server.c Server.o Server.po Server.So Server.do
-.SUFFIXES: .3-uuid.in .3
OBJS+= ${SRCS:N*.h:R:S/$/.o/g}
DOBJS+= ${OBJS:.o=.do}
@@ -58,38 +57,23 @@
# specify sources that will build with both the CFLAGS_XXX and CFLAGS_YYY
# flags set. The variants are always in alphabetic order.
#
-# The DYLD variant is special; it builds a separate archive for use by dyld,
-# and contains customized binaries that are used to override the behavior of
-# the corresponding binaries in libc.a. The DYLD variant by itself does not
-# cause BUILDING_VARIANT to be defined, and object files are in DYLDOBJS.
-#
-VARIANTS = CANCELABLE DARWINEXTSN DYLD
-
-.ifndef FEATURE_ONLY_64_BIT_INO_T
-VARIANTS += INODE32
-.endif
-.ifndef FEATURE_ONLY_1050_VARIANTS
-VARIANTS += PRE1050
-.endif
-.ifndef FEATURE_ONLY_UNIX_CONFORMANCE
-VARIANTS+= LEGACY
-.endif
+VARIANTS= DARWINEXTSN INODE32 CANCELABLE PRE1050
# Append the 64-bit long double sources (ppc only)
.if (${MACHINE_ARCH} == ppc)
-VARIANTS += LDBL
+VARIANTS+= LDBL
MDSRCS += ldbl64.s
.endif
-
+# build LEGACY variant except on LP64
+.ifndef LP64
+VARIANTS+= LEGACY
+.endif
+
+CFLAGS_LEGACY= -U__DARWIN_UNIX03 -D__DARWIN_UNIX03=0 -U__DARWIN_64_BIT_INO_T -D__DARWIN_64_BIT_INO_T=0 -DVARIANT_LEGACY
+CFLAGS_LDBL= -mlong-double-64 -DLDBL_COMPAT
+CFLAGS_DARWINEXTSN= -DVARIANT_DARWINEXTSN
+CFLAGS_INODE32= -U__DARWIN_64_BIT_INO_T -D__DARWIN_64_BIT_INO_T=0 -DVARIANT_INODE32
CFLAGS_CANCELABLE= -DVARIANT_CANCELABLE
-CFLAGS_DARWINEXTSN= -DVARIANT_DARWINEXTSN
-CFLAGS_DYLD= -DVARIANT_DYLD
-CFLAGS_INODE32= -U__DARWIN_64_BIT_INO_T -D__DARWIN_64_BIT_INO_T=0 -DVARIANT_INODE32
-CFLAGS_LDBL= -mlong-double-64 -DLDBL_COMPAT
-CFLAGS_LEGACY= -U__DARWIN_UNIX03 -D__DARWIN_UNIX03=0 -U__DARWIN_64_BIT_INO_T -D__DARWIN_64_BIT_INO_T=0 -DVARIANT_LEGACY
CFLAGS_PRE1050= -U__DARWIN_VERS_1050 -D__DARWIN_VERS_1050=0 -DVARIANT_PRE1050
-
-# to insure a variable expansion of the left-hand side of a comparison
-DYLD = DYLD
.for _v in ${VARIANTS}
COMBOARGS+= ${_v}/${CFLAGS_${_v}}
@@ -101,50 +85,46 @@
.endif
# For each of the variant combinations as target (and possibly suffixed with
# _D, _P, and _S for the four kinds on compile styles, we create a subdirectory
-# to do the compiling in, and then call ${MYBSDMAKE} with the new directory, and
+# to do the compiling in, and then call $(BSDMAKE) with the new directory, and
# setting VARIANTCFLAGS, which are the extra flags to be added to CFLAGS.
.for _v in ${VARIANTCOMBOCFLAGS}
VARIANTCOMBOS+= ${_v:H:S,/,,}
-.if ${DYLD} != ${_v:H:S,/,,}
-${_v:H:S,/,,}_BUILDING_VARIANT = -DBUILDING_VARIANT
-.endif
${_v:H:S,/,,}:
.ifdef ${_v:H:S,/,,}SRCS
- ${MKDIR} ${MAKEOBJDIR}/${_v:H:S,/,,}; \
- MAKEOBJDIR="${MAKEOBJDIR}/${_v:H:S,/,,}" VARIANTCFLAGS="-DBUILDING_VARIANT ${_v:T:S/@/ /g}" ${MYBSDMAKE} -C "${.CURDIR}" build_${_v:H:S,/,,}
+ mkdir -p ${MAKEOBJDIR}/${_v:H:S,/,,}; \
+ MAKEOBJDIR="$(MAKEOBJDIR)/${_v:H:S,/,,}" VARIANTCFLAGS="-DBUILDING_VARIANT ${_v:T:S/@/ /g}" $(BSDMAKE) -C "${.CURDIR}" build_${_v:H:S,/,,}
.endif
${_v:H:S,/,,}_D:
.ifdef ${_v:H:S,/,,}SRCS
- ${MKDIR} ${MAKEOBJDIR}/${_v:H:S,/,,}; \
- MAKEOBJDIR="${MAKEOBJDIR}/${_v:H:S,/,,}" VARIANTCFLAGS="-DBUILDING_VARIANT ${_v:T:S/@/ /g}" ${MYBSDMAKE} -C "${.CURDIR}" build_${_v:H:S,/,,}_D
+ mkdir -p ${MAKEOBJDIR}/${_v:H:S,/,,}; \
+ MAKEOBJDIR="$(MAKEOBJDIR)/${_v:H:S,/,,}" VARIANTCFLAGS="-DBUILDING_VARIANT ${_v:T:S/@/ /g}" $(BSDMAKE) -C "${.CURDIR}" build_${_v:H:S,/,,}_D
.endif
${_v:H:S,/,,}_P:
.ifdef ${_v:H:S,/,,}SRCS
- ${MKDIR} ${MAKEOBJDIR}/${_v:H:S,/,,}; \
- MAKEOBJDIR="${MAKEOBJDIR}/${_v:H:S,/,,}" VARIANTCFLAGS="-DBUILDING_VARIANT ${_v:T:S/@/ /g}" ${MYBSDMAKE} -C "${.CURDIR}" build_${_v:H:S,/,,}_P
+ mkdir -p ${MAKEOBJDIR}/${_v:H:S,/,,}; \
+ MAKEOBJDIR="$(MAKEOBJDIR)/${_v:H:S,/,,}" VARIANTCFLAGS="-DBUILDING_VARIANT ${_v:T:S/@/ /g}" $(BSDMAKE) -C "${.CURDIR}" build_${_v:H:S,/,,}_P
.endif
${_v:H:S,/,,}_S:
.ifdef ${_v:H:S,/,,}SRCS
- ${MKDIR} ${MAKEOBJDIR}/${_v:H:S,/,,}; \
- MAKEOBJDIR="${MAKEOBJDIR}/${_v:H:S,/,,}" VARIANTCFLAGS="${${_v:H:S,/,,}_BUILDING_VARIANT} ${_v:T:S/@/ /g}" ${MYBSDMAKE} -C "${.CURDIR}" build_${_v:H:S,/,,}_S
+ mkdir -p ${MAKEOBJDIR}/${_v:H:S,/,,}; \
+ MAKEOBJDIR="$(MAKEOBJDIR)/${_v:H:S,/,,}" VARIANTCFLAGS="-DBUILDING_VARIANT ${_v:T:S/@/ /g}" $(BSDMAKE) -C "${.CURDIR}" build_${_v:H:S,/,,}_S
.endif
.endfor
-# The non-DYLD variants
-.for _v in ${VARIANTCOMBOS:N*DYLD*}
+.for _v in ${VARIANTCOMBOS}
# Variant suffix rules so the filenames are unique and Libsystem won't complain
# because of ambiguities with -sectorder
.SUFFIXES: -${_v}.o -${_v}.do -${_v}.po -${_v}.So
.o-${_v}.o .do-${_v}.do .po-${_v}.po .So-${_v}.So:
- ${MV} ${.IMPSRC} ${.TARGET}
-
-# These are the build targets of the above ${MYBSDMAKE} calls, which just builds
+ mv ${.IMPSRC} ${.TARGET}
+
+# These are the build targets of the above $(BSDMAKE) calls, which just builds
# using the standard rules, but with the additional flags.
VARIANTOBJS+= ${${_v}SRCS:N*.h:R:S/$/-${_v}.o/g:S,^,${_v}/,g}
build_${_v}: ${${_v}SRCS:N*.h:R:S/$/-${_v}.o/g}
-build_${_v}_D: ${${_v}SRCS:N*.h:R:S/$/-${_v}.do/g}
-build_${_v}_P: ${${_v}SRCS:N*.h:R:S/$/-${_v}.po/g}
-build_${_v}_S: ${${_v}SRCS:N*.h:R:S/$/-${_v}.So/g}
+build_${_v}_D: ${${_v}SRCS:N*.h:R:S/$/-${_v}.do/g} ${${_v}SRCS2:N*.h:R:S/$/-${_v}.do/g}
+build_${_v}_P: ${${_v}SRCS:N*.h:R:S/$/-${_v}.po/g} ${${_v}SRCS2:N*.h:R:S/$/-${_v}.po/g}
+build_${_v}_S: ${${_v}SRCS:N*.h:R:S/$/-${_v}.So/g} ${${_v}SRCS2:N*.h:R:S/$/-${_v}.So/g}
.endfor
# These variables, plus VARIANTOBJS above, are the extra binaries that get
# added to the .a files. Note that these objects are in subdirectories
@@ -152,47 +132,30 @@
VARIANTDOBJS+= ${VARIANTOBJS:.o=.do}
VARIANTPOBJS+= ${VARIANTOBJS:.o=.po}
VARIANTSOBJS+= ${VARIANTOBJS:.o=.So}
-
-# Now for the DYLD variants
-.for _v in ${VARIANTCOMBOS:M*DYLD*}
-# Variant suffix rules so the filenames are unique and Libsystem won't complain
-# because of ambiguities with -sectorder
-.SUFFIXES: -${_v}.o -${_v}.do -${_v}.po -${_v}.So
-.o-${_v}.o .do-${_v}.do .po-${_v}.po .So-${_v}.So:
- ${MV} ${.IMPSRC} ${.TARGET}
-
-# These are the build targets of the above ${MYBSDMAKE} calls, which just builds
-# using the standard rules, but with the additional flags.
-DYLDOBJS+= ${${_v}SRCS:N*.h:R:S/$/-${_v}.So/g:S,^,${_v}/,g}
-build_${_v}:
-build_${_v}_D:
-build_${_v}_P:
-build_${_v}_S: ${${_v}SRCS:N*.h:R:S/$/-${_v}.So/g}
-.endfor
#### FreeBSD Rules ##################################################
PREFBSDFLAGS= -I${.CURDIR}/fbsdcompat
FBSDFLAGS= -include _fbsd_compat_.h
-fbsd.c.o:
- ${MYCC} -static \
+ ${CC} -static \
${PREFBSDFLAGS} ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \
${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \
${VARIANTCFLAGS} ${FBSDFLAGS} ${LIBCFLAGS} \
-Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET}
-fbsd.c.po:
- ${MYCC} -pg -DPROFILE \
+ ${CC} -pg -DPROFILE \
${PREFBSDFLAGS} ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \
${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \
${VARIANTCFLAGS} ${FBSDFLAGS} ${LIBCFLAGS} \
-Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET}
-fbsd.c.So:
- ${MYCC} \
+ ${CC} \
${PREFBSDFLAGS} ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \
${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \
${VARIANTCFLAGS} ${FBSDFLAGS} ${LIBCFLAGS} \
-Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET}
-fbsd.c.do:
- ${MYCC} -DDEBUG \
+ ${CC} -g -DDEBUG \
${PREFBSDFLAGS} ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \
${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \
${VARIANTCFLAGS} ${FBSDFLAGS} ${LIBCFLAGS} \
@@ -203,25 +166,25 @@
NBSDFLAGS= -include _nbsd_compat_.h
-nbsd.c.o:
- ${MYCC} -static \
+ ${CC} -static \
${PRENBSDFLAGS} ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \
${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \
${VARIANTCFLAGS} ${NBSDFLAGS} ${LIBCFLAGS} \
-Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET}
-nbsd.c.po:
- ${MYCC} -pg -DPROFILE \
+ ${CC} -pg -DPROFILE \
${PRENBSDFLAGS} ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \
${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \
${VARIANTCFLAGS} ${NBSDFLAGS} ${LIBCFLAGS} \
-Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET}
-nbsd.c.So:
- ${MYCC} \
+ ${CC} \
${PRENBSDFLAGS} ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \
${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \
${VARIANTCFLAGS} ${NBSDFLAGS} ${LIBCFLAGS} \
-Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET}
-nbsd.c.do:
- ${MYCC} -DDEBUG \
+ ${CC} -g -DDEBUG \
${PRENBSDFLAGS} ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \
${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \
${VARIANTCFLAGS} ${NBSDFLAGS} ${LIBCFLAGS} \
@@ -232,25 +195,25 @@
OBSDFLAGS=
-obsd.c.o:
- ${MYCC} -static \
+ ${CC} -static \
${PREOBSDFLAGS} ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \
${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \
${VARIANTCFLAGS} ${OBSDFLAGS} ${LIBCFLAGS} \
-Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET}
-obsd.c.po:
- ${MYCC} -pg -DPROFILE \
+ ${CC} -pg -DPROFILE \
${PREOBSDFLAGS} ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \
${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \
${VARIANTCFLAGS} ${OBSDFLAGS} ${LIBCFLAGS} \
-Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET}
-obsd.c.So:
- ${MYCC} \
+ ${CC} \
${PREOBSDFLAGS} ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \
${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \
${VARIANTCFLAGS} ${OBSDFLAGS} ${LIBCFLAGS} \
-Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET}
-obsd.c.do:
- ${MYCC} -DDEBUG \
+ ${CC} -g -DDEBUG \
${PREOBSDFLAGS} ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \
${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \
${VARIANTCFLAGS} ${OBSDFLAGS} ${LIBCFLAGS} \
@@ -261,56 +224,54 @@
UUIDFLAGS= -include uuid-config.h
-uuid.c.o:
- ${MYCC} -static \
+ ${CC} -static \
${PREUUIDFLAGS} ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \
${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \
${VARIANTCFLAGS} ${UUIDFLAGS} ${LIBCFLAGS} \
-Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET}
-uuid.c.po:
- ${MYCC} -pg -DPROFILE \
+ ${CC} -pg -DPROFILE \
${PREUUIDFLAGS} ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \
${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \
${VARIANTCFLAGS} ${UUIDFLAGS} ${LIBCFLAGS} \
-Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET}
-uuid.c.So:
- ${MYCC} \
+ ${CC} \
${PREUUIDFLAGS} ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \
${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \
${VARIANTCFLAGS} ${UUIDFLAGS} ${LIBCFLAGS} \
-Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET}
-uuid.c.do:
- ${MYCC} -DDEBUG \
+ ${CC} -g -DDEBUG \
${PREUUIDFLAGS} ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \
${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \
${VARIANTCFLAGS} ${UUIDFLAGS} ${LIBCFLAGS} \
-c ${.IMPSRC} -o ${.TARGET}
-.3-uuid.in.3:
- ${SED} -f ${SRCROOT}/uuid/uuidman.sed ${.IMPSRC} > ${.TARGET}
#### Standard C Rules #################################################
# If you change any of these standard rule, make corresponding changes
# to the _STANDARD_* macros in Makefile.inc
#######################################################################
.c.o User.cUser.o Server.cServer.o:
- ${MYCC} -static \
+ ${CC} -static \
${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \
${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \
${VARIANTCFLAGS} ${LIBCFLAGS} \
-Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET}
.c.po User.cUser.po Server.cServer.po:
- ${MYCC} -pg -DPROFILE \
+ ${CC} -pg -DPROFILE \
${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \
${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \
${VARIANTCFLAGS} ${LIBCFLAGS} \
-Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET}
.c.So User.cUser.So Server.cServer.So:
- ${MYCC} \
+ ${CC} \
${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \
${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \
${VARIANTCFLAGS} ${LIBCFLAGS} \
-Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET}
.c.do User.cUser.do Server.cServer.do:
- ${MYCC} -DDEBUG \
+ ${CC} -g -DDEBUG \
${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \
${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \
${VARIANTCFLAGS} ${LIBCFLAGS} \
@@ -318,65 +279,57 @@
#### Standard Assembler Rules #########################################
.s.o .S.o:
- ${MYCC} -static -x assembler-with-cpp \
+ ${CC} -static -x assembler-with-cpp \
${PRECFLAGS:M-[BIDFU]*} ${PRECFLAGS-${.IMPSRC:T}:M-[BIDFU]*} \
${CFLAGS:M-[BIDFU]*} ${CFLAGS-${.IMPSRC:T}:M-[BIDFU]*} ${AINC} \
-Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET}
.s.po .S.po:
- ${MYCC} -pg -x assembler-with-cpp -DPROFILE \
+ ${CC} -pg -x assembler-with-cpp -DPROFILE \
${PRECFLAGS:M-[BIDFU]*} ${PRECFLAGS-${.IMPSRC:T}:M-[BIDFU]*} \
${CFLAGS:M-[BIDFU]*} ${CFLAGS-${.IMPSRC:T}:M-[BIDFU]*} ${AINC} \
-Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET}
.s.So .S.So:
- ${MYCC} -x assembler-with-cpp \
+ ${CC} -x assembler-with-cpp \
${PRECFLAGS:M-[BIDFU]*} ${PRECFLAGS-${.IMPSRC:T}:M-[BIDFU]*} \
${CFLAGS:M-[BIDFU]*} ${CFLAGS-${.IMPSRC:T}:M-[BIDFU]*} ${AINC} \
-Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET}
.s.do .S.do:
- ${MYCC} -x assembler-with-cpp -DDEBUG \
+ ${CC} -g -x assembler-with-cpp -DDEBUG \
${PRECFLAGS:M-[BIDFU]*} ${PRECFLAGS-${.IMPSRC:T}:M-[BIDFU]*} \
${CFLAGS:M-[BIDFU]*} ${CFLAGS-${.IMPSRC:T}:M-[BIDFU]*} ${AINC} \
-c ${.IMPSRC} -o ${.TARGET}
#### mig Rules ########################################################
.defs.h .defsUser.c .defsServer.c:
- ${MIG} -arch ${CCARCH} -cc ${MYCC} -user ${.PREFIX}User.c -server ${.PREFIX}Server.c -header ${.PREFIX}.h ${.IMPSRC}
+ mig -arch ${MACHINE_ARCH} -cc ${CC} -user ${.PREFIX}User.c -server ${.PREFIX}Server.c -header ${.PREFIX}.h ${.IMPSRC}
gen_mig_defs: ${SRVMIGHDRS} ${MIGHDRS}
gen_md_mig_defs: ${MD_MIGHDRS}
#### Library Rules ####################################################
-${VARIANTCOMBOS:N*DYLD*} ${OBJS} ${STATICOBJS}: ${SYMROOTINC}/${MACHINE_ARCH}/libc-features.h
-lib${LIB}_static.a:: ${VARIANTCOMBOS:N*DYLD*} ${OBJS} ${STATICOBJS}
+lib${LIB}_static.a:: ${VARIANTCOMBOS} ${OBJS} ${STATICOBJS}
@${ECHO} building static ${LIB} library
- @${RM} lib${LIB}_static.a
- @${AR} cq lib${LIB}_static.a `${LORDER} ${OBJS} ${STATICOBJS} ${VARIANTOBJS} | ${TSORT} -q`
+ @rm -f lib${LIB}_static.a
+ @${AR} cq lib${LIB}_static.a `lorder ${OBJS} ${STATICOBJS} ${VARIANTOBJS} | tsort -q` ${ARADD}
${RANLIB} lib${LIB}_static.a
-${VARIANTCOMBOS:N*DYLD*:S/$/_P/g} ${POBJS}: ${SYMROOTINC}/${MACHINE_ARCH}/libc-features.h
-lib${LIB}_profile.a:: ${VARIANTCOMBOS:N*DYLD*:S/$/_P/g} ${POBJS}
+lib${LIB}_profile.a:: ${VARIANTCOMBOS:S/$/_P/g} ${POBJS} ${POBJS2}
@${ECHO} building profiled ${LIB} library
- @${RM} lib${LIB}_profile.a
- @${AR} cq lib${LIB}_profile.a `${LORDER} ${POBJS} ${VARIANTPOBJS} | ${TSORT} -q`
+ @rm -f lib${LIB}_profile.a
+ @${AR} cq lib${LIB}_profile.a `lorder ${POBJS} ${VARIANTPOBJS} | tsort -q` ${ARADD}
${RANLIB} lib${LIB}_profile.a
-${VARIANTCOMBOS:N*DYLD*:S/$/_D/g} ${DOBJS}: ${SYMROOTINC}/${MACHINE_ARCH}/libc-features.h
-lib${LIB}_debug.a:: ${VARIANTCOMBOS:N*DYLD*:S/$/_D/g} ${DOBJS}
+lib${LIB}_debug.a:: ${VARIANTCOMBOS:S/$/_D/g} ${DOBJS} ${DOBJS2}
@${ECHO} building debug ${LIB} library
- @${RM} lib${LIB}_debug.a
- @${AR} cq lib${LIB}_debug.a `${LORDER} ${DOBJS} ${VARIANTDOBJS} | ${TSORT} -q`
+ @rm -f lib${LIB}_debug.a
+ @${AR} cq lib${LIB}_debug.a `lorder ${DOBJS} ${VARIANTDOBJS} | tsort -q` ${ARADD}
${RANLIB} lib${LIB}_debug.a
-${VARIANTCOMBOS:S/$/_S/g} ${SOBJS}: ${SYMROOTINC}/${MACHINE_ARCH}/libc-features.h
-lib${LIB}.a:: ${VARIANTCOMBOS:S/$/_S/g} ${SOBJS}
+lib${LIB}.a:: ${VARIANTCOMBOS:S/$/_S/g} ${SOBJS} ${SOBJS2}
@${ECHO} building standard ${LIB} library
- @${RM} lib${LIB}.a
- @${AR} cq lib${LIB}.a `${LORDER} ${SOBJS} ${VARIANTSOBJS} | ${TSORT} -q`
+ @rm -f lib${LIB}.a
+ @${AR} cq lib${LIB}.a `lorder ${SOBJS} ${VARIANTSOBJS} | tsort -q` ${ARADD}
${RANLIB} lib${LIB}.a
- @${ECHO} building custom ${LIB} library for dyld
- @${RM} lib${LIB}-dyld.a
- @${AR} cq lib${LIB}-dyld.a `${LORDER} ${DYLDOBJS} | ${TSORT} -q`
- ${RANLIB} lib${LIB}-dyld.a
CLEANFILES += ${DOBJS} libc_static.a libc_profile.a libc_debug.a
@@ -386,86 +339,74 @@
PRIVHDRS = ${SYSTEMFRAMEWORK}/Versions/B/PrivateHeaders
KERNELFRAMEWORK = ${DESTDIR}/System/Library/Frameworks/Kernel.framework
PRIVKERNELHDRS = ${KERNELFRAMEWORK}/Versions/A/PrivateHeaders
-INSTALLMODE != ${TEST} `id -u` -eq 0 && ${ECHO} 444 || ${ECHO} 644
+INSTALLMODE != test `id -u` -eq 0 && echo 444 || echo 644
installhdrs-md: gen_md_mig_defs
-installhdrs: modifyhdrs
-
-copyhdrs: gen_mig_defs
- ${MKDIR} ${INCDIR}/arpa
- ${MKDIR} ${INCDIR}/libkern
- ${MKDIR} ${INCDIR}/malloc
-.ifdef OBJC_INSTHDRS
- ${MKDIR} ${INCDIR}/objc
-.endif
- ${MKDIR} ${INCDIR}/protocols
- ${MKDIR} ${INCDIR}/secure
- ${MKDIR} ${INCDIR}/sys
- ${MKDIR} ${INCDIR}/xlocale
- ${INSTALL} -m ${INSTALLMODE} ${INSTHDRS} ${INCDIR}
- ${INSTALL} -m ${INSTALLMODE} ${ARPA_INSTHDRS} ${INCDIR}/arpa
- ${INSTALL} -m ${INSTALLMODE} ${LIBKERN_INSTHDRS} ${INCDIR}/libkern
- ${INSTALL} -m ${INSTALLMODE} ${MALLOC_INSTHDRS} ${INCDIR}/malloc
-.ifdef OBJC_INSTHDRS
- ${INSTALL} -m ${INSTALLMODE} ${OBJC_INSTHDRS} ${INCDIR}/objc
-.endif
- ${INSTALL} -m ${INSTALLMODE} ${PROTO_INSTHDRS} ${INCDIR}/protocols
- ${INSTALL} -m ${INSTALLMODE} ${SECURE_INSTHDRS} ${INCDIR}/secure
- ${INSTALL} -m ${INSTALLMODE} ${SYS_INSTHDRS} ${INCDIR}/sys
- ${INSTALL} -m ${INSTALLMODE} ${XLOCALE_INSTHDRS} ${INCDIR}/xlocale
- ${MKDIR} ${LOCINCDIR}
- ${INSTALL} -m ${INSTALLMODE} ${LOCALHDRS} ${LOCINCDIR}
- ${MKDIR} ${PRIVHDRS}/btree
- ${MKDIR} ${PRIVHDRS}/machine
- ${MKDIR} ${PRIVHDRS}/objc
- ${MKDIR} ${PRIVHDRS}/uuid
- ${MKDIR} ${PRIVHDRS}/sys
- ${MKDIR} ${PRIVKERNELHDRS}/uuid
- ${INSTALL} -m ${INSTALLMODE} ${PRIV_INSTHDRS} ${PRIVHDRS}
- ${INSTALL} -m ${INSTALLMODE} ${INSTBTREEPRIVHDRS_AUTOPATCH} ${PRIVHDRS}/btree
- ${INSTALL} -m ${INSTALLMODE} ${SRCROOT}/internat/NXCType.h ${PRIVHDRS}/objc
- ${MV} ${DESTDIR}/usr/include/asm.h ${PRIVHDRS}/machine
- ${INSTALL} -m ${INSTALLMODE} ${SYS_INSTHDRS} ${PRIVHDRS}/sys
- ${INSTALL} -m ${INSTALLMODE} ${PRIVUUID_INSTHDRS} ${PRIVHDRS}/uuid
- ${INSTALL} -m ${INSTALLMODE} ${PRIVUUID_INSTHDRS} ${PRIVKERNELHDRS}/uuid
-
-modifyhdrs: copyhdrs
- @for i in `${FIND} '${DESTDIR}' -name \*.h -print0 | ${XARGS} -0 ${GREP} -l '^//Begin-Libc'`; do \
- ${CHMOD} u+w $$i && \
- ${ECHO} ${ED} - $$i \< ${.CURDIR}/strip-header.ed && \
- ${ED} - $$i < ${.CURDIR}/strip-header.ed && \
- ${CHMOD} u-w $$i || exit 1; \
- done
- @for i in `${FIND} '${DESTDIR}' -name \*.h -print0 | ${XARGS} -0 ${FGREP} -l UNIFDEF`; do \
- ${CHMOD} u+w $$i && \
- ${CP} $$i $$i.orig && \
- ${ECHO} ${UNIFDEF} ${UNIFDEFARGS} $$i.orig \> $$i && \
- { ${UNIFDEF} ${UNIFDEFARGS} $$i.orig > $$i || [ $$? -ne 2 ]; } && \
- ${RM} $$i.orig && \
- ${CHMOD} u-w $$i || exit 1; \
- done
+installhdrs: gen_mig_defs
+ mkdir -p ${INCDIR}/arpa
+ mkdir -p ${INCDIR}/libkern
+ mkdir -p ${INCDIR}/machine
+ mkdir -p ${INCDIR}/malloc
+ mkdir -p ${INCDIR}/objc
+ mkdir -p ${INCDIR}/protocols
+ mkdir -p ${INCDIR}/secure
+ mkdir -p ${INCDIR}/sys
+ mkdir -p ${INCDIR}/xlocale
+ ${INSTALL} -c -m ${INSTALLMODE} ${INSTHDRS} ${INCDIR}
+ ${INSTALL} -c -m ${INSTALLMODE} ${ARPA_INSTHDRS} ${INCDIR}/arpa
+ ${INSTALL} -c -m ${INSTALLMODE} ${LIBKERN_INSTHDRS} ${INCDIR}/libkern
+ ${INSTALL} -c -m ${INSTALLMODE} ${MACHINE_INSTHDRS} ${INCDIR}/machine
+ ${INSTALL} -c -m ${INSTALLMODE} ${MALLOC_INSTHDRS} ${INCDIR}/malloc
+ ${INSTALL} -c -m ${INSTALLMODE} ${OBJC_INSTHDRS} ${INCDIR}/objc
+ ${INSTALL} -c -m ${INSTALLMODE} ${PROTO_INSTHDRS} ${INCDIR}/protocols
+ ${INSTALL} -c -m ${INSTALLMODE} ${SECURE_INSTHDRS} ${INCDIR}/secure
+ ${INSTALL} -c -m ${INSTALLMODE} ${SYS_INSTHDRS} ${INCDIR}/sys
+ ${INSTALL} -c -m ${INSTALLMODE} ${XLOCALE_INSTHDRS} ${INCDIR}/xlocale
+ mkdir -p ${LOCINCDIR}
+ ${INSTALL} -c -m ${INSTALLMODE} ${LOCALHDRS} ${LOCINCDIR}
+ mkdir -p ${PRIVHDRS}/btree
+ mkdir -p ${PRIVHDRS}/machine
+ mkdir -p ${PRIVHDRS}/objc
+ mkdir -p ${PRIVHDRS}/uuid
+ mkdir -p ${PRIVHDRS}/sys
+ mkdir -p ${PRIVKERNELHDRS}/uuid
+ ${INSTALL} -c -m ${INSTALLMODE} ${PRIV_INSTHDRS} ${PRIVHDRS}
+ ${INSTALL} -c -m ${INSTALLMODE} ${INSTBTREEPRIVHDRS_AUTOPATCH} ${PRIVHDRS}/btree
+ ${INSTALL} -c -m ${INSTALLMODE} ${SRCROOT}/internat/NXCType.h ${PRIVHDRS}/objc
+ mv ${DESTDIR}/usr/include/asm.h ${PRIVHDRS}/machine
+ ${INSTALL} -c -m ${INSTALLMODE} ${SYS_INSTHDRS} ${PRIVHDRS}/sys
+ ${INSTALL} -c -m ${INSTALLMODE} ${PRIVUUID_INSTHDRS} ${PRIVHDRS}/uuid
+ ${INSTALL} -c -m ${INSTALLMODE} ${PRIVUUID_INSTHDRS} ${PRIVKERNELHDRS}/uuid
+.for _h in ${STRIP_HDRS}
+ chmod u+w ${INCDIR}/${_h}
+ ed - ${INCDIR}/${_h} < ${.CURDIR}/strip-header.ed
+ chmod u-w ${INCDIR}/${_h}
+.endfor
+ ${INSTALL} -c -m 644 /usr/include/AvailabilityMacros.h ${OBJROOT}/available.h
+ ex - ${OBJROOT}/available.h < ${.CURDIR}/available.ex
+ ${INSTALL} -c -m ${INSTALLMODE} ${OBJROOT}/available.h ${INCDIR}
install_lib${LIB}_static.a:
- ${INSTALL} -m ${INSTALLMODE} lib${LIB}_static.a ${DESTDIR}/usr/local/lib/system/
+ ${INSTALL} -c -m ${INSTALLMODE} lib${LIB}_static.a ${DESTDIR}/usr/local/lib/system/
install_lib${LIB}_profile.a:
- ${INSTALL} -m ${INSTALLMODE} lib${LIB}_profile.a ${DESTDIR}/usr/local/lib/system
+ ${INSTALL} -c -m ${INSTALLMODE} lib${LIB}_profile.a ${DESTDIR}/usr/local/lib/system
install_lib${LIB}_debug.a:
- ${INSTALL} -m ${INSTALLMODE} lib${LIB}_debug.a ${DESTDIR}/usr/local/lib/system/
+ ${INSTALL} -c -m ${INSTALLMODE} lib${LIB}_debug.a ${DESTDIR}/usr/local/lib/system/
install_lib${LIB}.a:
- ${INSTALL} -m ${INSTALLMODE} lib${LIB}.a ${DESTDIR}/usr/local/lib/system/
-
-autopatch: ${AUTOPATCHHDRS} ${AUTOPATCHSRCS} ${AUTOPATCHMAN}
+ ${INSTALL} -c -m ${INSTALLMODE} lib${LIB}.a ${DESTDIR}/usr/local/lib/system/
+
+autopatchman: ${AUTOPATCHMAN}
copyfiles:
-.if !empty(COPYFILES)
- ${INSTALL} -m ${INSTALLMODE} ${COPYFILES} ${DESTDIR}/usr/local/lib/system
-.endif
-.if !empty(MDCOPYFILES)
- ${INSTALL} -m ${INSTALLMODE} ${MDCOPYFILES} ${DESTDIR}/usr/local/lib/system
+.if !empty $(COPYFILES)
+ $(INSTALL) -c -m 444 ${COPYFILES} ${DESTDIR}/usr/local/lib/system
+.endif
+.if !empty $(MDCOPYFILES)
+ $(INSTALL) -c -m 444 ${MDCOPYFILES} ${DESTDIR}/usr/local/lib/system
.endif
clean:
- ${RM} ${OBJS} ${POBJS} ${DOBJS} ${SOBJS} ${CLEANFILES}
- ${RM} lib${LIB}.a lib${LIB}_static.a lib${LIB}_profile.a \
+ rm -f ${OBJS} ${POBJS} ${DOBJS} ${SOBJS} ${CLEANFILES}
+ rm -f lib${LIB}.a lib${LIB}_static.a lib${LIB}_profile.a \
lib${LIB}_debug.a