X-Git-Url: https://git.saurik.com/apple/libc.git/blobdiff_plain/3d9156a7a519a5e3aa1b92e9d9d4b991f1aed7ff..7ba935f9833da45a0dbcb06329e3015acee97223:/Makefile.xbs diff --git a/Makefile.xbs b/Makefile.xbs index c8deeb2..7ca23a0 100644 --- a/Makefile.xbs +++ b/Makefile.xbs @@ -19,49 +19,29 @@ # should only be installed once as well. Both of these get done when # we're invoked as "Libc". +MYBSDMAKE = ${BSDMAKE} -f Makefile + .PATH: . .MAIN: all all: libc.a libc_static.a libc_debug.a libc_profile.a -install: installhdrs install_libc.a install_libc_static.a \ - install_libc_profile.a install_libc_debug.a autopatchman maninstall +install: ${SYMROOTINC}/${MACHINE_ARCH}/libc-features.h installhdrs install_libc.a \ + install_libc_profile.a install_libc_debug.a \ + maninstall .SUFFIXES: .SUFFIXES: .o .po .So .do .SUFFIXES: .S .s .c .cc .cpp .cxx .m .C -.SUFFIXES: -fbsd.c -nbsd.c -obsd.c -uuid.c .3-uuid.in .3 +.SUFFIXES: -fbsd.c -nbsd.c -obsd.c -uuid.c .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} POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o=.po} SOBJS+= ${OBJS:.o=.So} -#### 128-bit Long Double libc-ldbl128 for Panther #################### -.if (${MACHINE_ARCH} == ppc) -LIB128= ${LIB}-ldbl128 -LDBL_128_SRCS= _hdtoa.c _ldbl_util.c _ldtoa.c asprintf.c err.c fprintf.c \ - fscanf.c fwprintf.c fwscanf.c gdtoa-strtopdd.c machdep_ldisdd.c \ - printf.c scanf.c snprintf.c sprintf.c sscanf.c swprintf.c swscanf.c \ - vasprintf.c vfprintf.c vfscanf.c vfwprintf.c vfwscanf.c vprintf.c \ - vscanf.c vsnprintf.c vsprintf.c vsscanf.c vswprintf.c vswscanf.c \ - vwprintf.c vwscanf.c wcstold.c wprintf.c wscanf.c \ - oldldbl64.s oldsyslog.c LDBL/oldsyslog-LDBL.c \ - LDBL/err-LDBL.c LDBL/vfprintf-LDBL.c LDBL/vfwprintf-LDBL.c -LDBL_128_OBJS= ${LDBL_128_SRCS:R:S/$/.o/g} -LDBL_128_DOBJS= ${LDBL_128_OBJS:.o=.do} -LDBL_128_POBJS= ${LDBL_128_OBJS:.o=.po} -LDBL_128_SOBJS= ${LDBL_128_OBJS:.o=.So} - -LDBLSRCS2+= oldsyslog.c -SRCS2+= oldldbl64.s oldsyslog.c -OBJS2+= ${SRCS2:N*.h:R:S/$/.o/g} -DOBJS2+= ${OBJS2:.o=.do} -POBJS2+= ${OBJS2:.o=.po} -SOBJS2+= ${OBJS2:.o=.So} -.endif - #### Variant Rules #################################################### # The following magic is used for variants to avoid the exponental explosion # of suffix rules. To add a variant, select a name (typically all-caps). @@ -78,20 +58,38 @@ SOBJS2+= ${OBJS2:.o=.So} # specify sources that will build with both the CFLAGS_XXX and CFLAGS_YYY # flags set. The variants are always in alphabetic order. # -VARIANTS= +# 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 # Append the 64-bit long double sources (ppc only) .if (${MACHINE_ARCH} == ppc) -VARIANTS+= LDBL +VARIANTS += LDBL MDSRCS += ldbl64.s .endif -# build UNIX03 variant except on ppc64 -.if (${MACHINE_ARCH} != ppc64) -VARIANTS+= UNIX03 -.endif -CFLAGS+= ${VARIANTCFLAGS} -CFLAGS_UNIX03= -U__DARWIN_UNIX03 -D__DARWIN_UNIX03=1 +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}} @@ -103,46 +101,50 @@ VARIANTCOMBOCFLAGS != ${.CURDIR}/makeCombos ${COMBOARGS} .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 bsdmake with the new directory, and +# to do the compiling in, and then call ${MYBSDMAKE} 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 -p ${MAKEOBJDIR}/${_v:H:S,/,,}; \ - MAKEOBJDIR="$(MAKEOBJDIR)/${_v:H:S,/,,}" VARIANTCFLAGS="-DBUILDING_VARIANT ${_v:T:S/@/ /g}" bsdmake -C "${.CURDIR}" build_${_v:H:S,/,,} + ${MKDIR} ${MAKEOBJDIR}/${_v:H:S,/,,}; \ + MAKEOBJDIR="${MAKEOBJDIR}/${_v:H:S,/,,}" VARIANTCFLAGS="-DBUILDING_VARIANT ${_v:T:S/@/ /g}" ${MYBSDMAKE} -C "${.CURDIR}" build_${_v:H:S,/,,} .endif ${_v:H:S,/,,}_D: .ifdef ${_v:H:S,/,,}SRCS - 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 + ${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 .endif ${_v:H:S,/,,}_P: .ifdef ${_v:H:S,/,,}SRCS - 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 + ${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 .endif ${_v:H:S,/,,}_S: .ifdef ${_v:H:S,/,,}SRCS - 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 + ${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 .endif .endfor -.for _v in ${VARIANTCOMBOS} +# The non-DYLD variants +.for _v in ${VARIANTCOMBOS:N*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} + ${MV} ${.IMPSRC} ${.TARGET} -# These are the build targets of the above bsdmake calls, which just builds +# These are the build targets of the above ${MYBSDMAKE} 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} ${${_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} +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} .endfor # These variables, plus VARIANTOBJS above, are the extra binaries that get # added to the .a files. Note that these objects are in subdirectories @@ -150,150 +152,231 @@ build_${_v}_S: ${${_v}SRCS:N*.h:R:S/$/-${_v}.So/g} ${${_v}SRCS2:N*.h:R:S/$/-${_v 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 ################################################## -FBSDFLAGS= -I${.CURDIR}/fbsdcompat -include _fbsd_compat_.h +PREFBSDFLAGS= -I${.CURDIR}/fbsdcompat +FBSDFLAGS= -include _fbsd_compat_.h -fbsd.c.o: - ${CC} -static ${FBSDFLAGS} ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \ + ${MYCC} -static \ + ${PREFBSDFLAGS} ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \ + ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \ + ${VARIANTCFLAGS} ${FBSDFLAGS} ${LIBCFLAGS} \ -Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET} -fbsd.c.po: - ${CC} -pg -DPROFILE ${FBSDFLAGS} ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \ + ${MYCC} -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: - ${CC} ${FBSDFLAGS} ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \ + ${MYCC} \ + ${PREFBSDFLAGS} ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \ + ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \ + ${VARIANTCFLAGS} ${FBSDFLAGS} ${LIBCFLAGS} \ -Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET} -fbsd.c.do: - ${CC} -g -DDEBUG ${FBSDFLAGS} ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \ + ${MYCC} -DDEBUG \ + ${PREFBSDFLAGS} ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \ + ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \ + ${VARIANTCFLAGS} ${FBSDFLAGS} ${LIBCFLAGS} \ -c ${.IMPSRC} -o ${.TARGET} #### NetBSD Rules ################################################## -NBSDFLAGS= -I${.CURDIR}/nbsdcompat -include _nbsd_compat_.h +PRENBSDFLAGS= -I${.CURDIR}/nbsdcompat +NBSDFLAGS= -include _nbsd_compat_.h -nbsd.c.o: - ${CC} -static ${NBSDFLAGS} ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \ + ${MYCC} -static \ + ${PRENBSDFLAGS} ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \ + ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \ + ${VARIANTCFLAGS} ${NBSDFLAGS} ${LIBCFLAGS} \ -Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET} -nbsd.c.po: - ${CC} -pg -DPROFILE ${NBSDFLAGS} ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \ + ${MYCC} -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: - ${CC} ${NBSDFLAGS} ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \ + ${MYCC} \ + ${PRENBSDFLAGS} ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \ + ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \ + ${VARIANTCFLAGS} ${NBSDFLAGS} ${LIBCFLAGS} \ -Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET} -nbsd.c.do: - ${CC} -g -DDEBUG ${NBSDFLAGS} ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \ + ${MYCC} -DDEBUG \ + ${PRENBSDFLAGS} ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \ + ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \ + ${VARIANTCFLAGS} ${NBSDFLAGS} ${LIBCFLAGS} \ -c ${.IMPSRC} -o ${.TARGET} #### OpenBSD Rules ################################################## +PREOBSDFLAGS= OBSDFLAGS= -obsd.c.o: - ${CC} -static ${OBSDFLAGS} ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \ + ${MYCC} -static \ + ${PREOBSDFLAGS} ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \ + ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \ + ${VARIANTCFLAGS} ${OBSDFLAGS} ${LIBCFLAGS} \ -Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET} -obsd.c.po: - ${CC} -pg -DPROFILE ${OBSDFLAGS} ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \ + ${MYCC} -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: - ${CC} ${OBSDFLAGS} ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \ + ${MYCC} \ + ${PREOBSDFLAGS} ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \ + ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \ + ${VARIANTCFLAGS} ${OBSDFLAGS} ${LIBCFLAGS} \ -Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET} -obsd.c.do: - ${CC} -g -DDEBUG ${OBSDFLAGS} ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \ + ${MYCC} -DDEBUG \ + ${PREOBSDFLAGS} ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \ + ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \ + ${VARIANTCFLAGS} ${OBSDFLAGS} ${LIBCFLAGS} \ -c ${.IMPSRC} -o ${.TARGET} #### UUID Rules ###################################################### -UUIDFLAGS= -I${.CURDIR}/uuid -include uuid-config.h +PREUUIDFLAGS= -I${.CURDIR}/uuid +UUIDFLAGS= -include uuid-config.h -uuid.c.o: - ${CC} -static ${UUIDFLAGS} ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \ + ${MYCC} -static \ + ${PREUUIDFLAGS} ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \ + ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \ + ${VARIANTCFLAGS} ${UUIDFLAGS} ${LIBCFLAGS} \ -Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET} -uuid.c.po: - ${CC} -pg -DPROFILE ${UUIDFLAGS} ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \ + ${MYCC} -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: - ${CC} ${UUIDFLAGS} ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \ + ${MYCC} \ + ${PREUUIDFLAGS} ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \ + ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \ + ${VARIANTCFLAGS} ${UUIDFLAGS} ${LIBCFLAGS} \ -Os ${OPTIMIZE-${.IMPSRC:T}} -c ${.IMPSRC} -o ${.TARGET} -uuid.c.do: - ${CC} -g -DDEBUG ${UUIDFLAGS} ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \ + ${MYCC} -DDEBUG \ + ${PREUUIDFLAGS} ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \ + ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \ + ${VARIANTCFLAGS} ${UUIDFLAGS} ${LIBCFLAGS} \ -c ${.IMPSRC} -o ${.TARGET} .3-uuid.in.3: - sed -f ${.CURDIR}/uuid/uuidman.sed ${.IMPSRC} > ${.TARGET} + ${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: - ${CC} -static ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \ + ${MYCC} -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: - ${CC} -pg -DPROFILE ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \ + ${MYCC} -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: - ${CC} ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \ + ${MYCC} \ + ${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: - ${CC} -g -DDEBUG ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \ + ${MYCC} -DDEBUG \ + ${PRECFLAGS} ${PRECFLAGS-${.IMPSRC:T}} \ + ${CFLAGS} ${CFLAGS-${.IMPSRC:T}} \ + ${VARIANTCFLAGS} ${LIBCFLAGS} \ -c ${.IMPSRC} -o ${.TARGET} #### Standard Assembler Rules ######################################### -.s.o: - ${CC} -static -x assembler-with-cpp ${CFLAGS:M-[BIDF]*} \ - ${CFLAGS-${.IMPSRC:T}:M-[BIDF]*} ${AINC} \ +.s.o .S.o: + ${MYCC} -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: - ${CC} -pg -DPROFILE -x assembler-with-cpp ${CFLAGS:M-[BIDF]*} \ - ${CFLAGS-${.IMPSRC:T}:M-[BIDF]*} ${AINC} \ +.s.po .S.po: + ${MYCC} -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: - ${CC} -x assembler-with-cpp ${CFLAGS:M-[BIDF]*} \ - ${CFLAGS-${.IMPSRC:T}:M-[BIDF]*} ${AINC} \ +.s.So .S.So: + ${MYCC} -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: - ${CC} -g -DDEBUG -x assembler-with-cpp ${CFLAGS:M-[BIDF]*} \ - ${CFLAGS-${.IMPSRC:T}:M-[BIDF]*} ${AINC} \ +.s.do .S.do: + ${MYCC} -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 ${MACHINE_ARCH} -cc ${CC} -user ${.PREFIX}User.c -server ${.PREFIX}Server.c -header ${.PREFIX}.h ${.IMPSRC} + ${MIG} -arch ${CCARCH} -cc ${MYCC} -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 #################################################### -lib${LIB}_static.a:: ${VARIANTCOMBOS} ${OBJS} ${STATICOBJS} +${VARIANTCOMBOS:N*DYLD*} ${OBJS} ${STATICOBJS}: ${SYMROOTINC}/${MACHINE_ARCH}/libc-features.h +lib${LIB}_static.a:: ${VARIANTCOMBOS:N*DYLD*} ${OBJS} ${STATICOBJS} @${ECHO} building static ${LIB} library - @rm -f lib${LIB}_static.a - @${AR} cq lib${LIB}_static.a `lorder ${OBJS} ${STATICOBJS} ${VARIANTOBJS} | tsort -q` ${ARADD} + @${RM} lib${LIB}_static.a + @${AR} cq lib${LIB}_static.a `${LORDER} ${OBJS} ${STATICOBJS} ${VARIANTOBJS} | ${TSORT} -q` ${RANLIB} lib${LIB}_static.a -lib${LIB}_profile.a:: ${VARIANTCOMBOS:S/$/_P/g} ${POBJS} ${POBJS2} +${VARIANTCOMBOS:N*DYLD*:S/$/_P/g} ${POBJS}: ${SYMROOTINC}/${MACHINE_ARCH}/libc-features.h +lib${LIB}_profile.a:: ${VARIANTCOMBOS:N*DYLD*:S/$/_P/g} ${POBJS} @${ECHO} building profiled ${LIB} library - @rm -f lib${LIB}_profile.a - @${AR} cq lib${LIB}_profile.a `lorder ${POBJS} ${VARIANTPOBJS} | tsort -q` ${ARADD} + @${RM} lib${LIB}_profile.a + @${AR} cq lib${LIB}_profile.a `${LORDER} ${POBJS} ${VARIANTPOBJS} | ${TSORT} -q` ${RANLIB} lib${LIB}_profile.a -.if (${MACHINE_ARCH} == ppc) - @${ECHO} building profiled ${LIB128} library - @rm -f lib${LIB128}_profile.a - @${AR} cq lib${LIB128}_profile.a ${LDBL_128_POBJS} -.endif -lib${LIB}_debug.a:: ${VARIANTCOMBOS:S/$/_D/g} ${DOBJS} ${DOBJS2} +${VARIANTCOMBOS:N*DYLD*:S/$/_D/g} ${DOBJS}: ${SYMROOTINC}/${MACHINE_ARCH}/libc-features.h +lib${LIB}_debug.a:: ${VARIANTCOMBOS:N*DYLD*:S/$/_D/g} ${DOBJS} @${ECHO} building debug ${LIB} library - @rm -f lib${LIB}_debug.a - @${AR} cq lib${LIB}_debug.a `lorder ${DOBJS} ${VARIANTDOBJS} | tsort -q` ${ARADD} + @${RM} lib${LIB}_debug.a + @${AR} cq lib${LIB}_debug.a `${LORDER} ${DOBJS} ${VARIANTDOBJS} | ${TSORT} -q` ${RANLIB} lib${LIB}_debug.a -.if (${MACHINE_ARCH} == ppc) - @${ECHO} building debug ${LIB128} library - @rm -f lib${LIB128}_debug.a - @${AR} cq lib${LIB128}_debug.a ${LDBL_128_DOBJS} -.endif -lib${LIB}.a:: ${VARIANTCOMBOS:S/$/_S/g} ${SOBJS} ${SOBJS2} +${VARIANTCOMBOS:S/$/_S/g} ${SOBJS}: ${SYMROOTINC}/${MACHINE_ARCH}/libc-features.h +lib${LIB}.a:: ${VARIANTCOMBOS:S/$/_S/g} ${SOBJS} @${ECHO} building standard ${LIB} library - @rm -f lib${LIB}.a - @${AR} cq lib${LIB}.a `lorder ${SOBJS} ${VARIANTSOBJS} | tsort -q` ${ARADD} + @${RM} lib${LIB}.a + @${AR} cq lib${LIB}.a `${LORDER} ${SOBJS} ${VARIANTSOBJS} | ${TSORT} -q` ${RANLIB} lib${LIB}.a -.if (${MACHINE_ARCH} == ppc) - @${ECHO} building standard ${LIB128} library - @rm -f lib${LIB128}.a - @${AR} cq lib${LIB128}.a ${LDBL_128_SOBJS} -.endif + @${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 @@ -303,80 +386,86 @@ SYSTEMFRAMEWORK = ${DESTDIR}/System/Library/Frameworks/System.framework 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 installhdrs-md: gen_md_mig_defs - mkdir -p ${INCDIR}/mach/${MACHINE_ARCH} - ${INSTALL} -c -m 444 ${MD_MIGHDRS} ${INCDIR}/mach/${MACHINE_ARCH} - -installhdrs: autopatchhdrs gen_mig_defs - mkdir -p ${INCDIR}/arpa - mkdir -p ${INCDIR}/libkern - mkdir -p ${INCDIR}/mach - mkdir -p ${INCDIR}/machine - mkdir -p ${INCDIR}/malloc - mkdir -p ${INCDIR}/objc - mkdir -p ${INCDIR}/protocols - mkdir -p ${INCDIR}/servers - mkdir -p ${INCDIR}/sys - mkdir -p ${INCDIR}/xlocale - ${INSTALL} -c -m 444 ${INSTHDRS} ${INCDIR} - ${INSTALL} -c -m 444 ${ARPA_INSTHDRS} ${INCDIR}/arpa - ${INSTALL} -c -m 444 ${LIBKERN_INSTHDRS} ${INCDIR}/libkern - ${INSTALL} -c -m 444 ${MACH_INSTHDRS} ${INCDIR}/mach - ${INSTALL} -c -m 444 ${MACHINE_INSTHDRS} ${INCDIR}/machine - ${INSTALL} -c -m 444 ${MALLOC_INSTHDRS} ${INCDIR}/malloc - ${INSTALL} -c -m 444 ${OBJC_INSTHDRS} ${INCDIR}/objc - ${INSTALL} -c -m 444 ${PROTO_INSTHDRS} ${INCDIR}/protocols - ${INSTALL} -c -m 444 ${SRVHDRS} ${INCDIR}/servers - ${INSTALL} -c -m 444 ${SYS_INSTHDRS} ${INCDIR}/sys - ${INSTALL} -c -m 444 ${XLOCALE_INSTHDRS} ${INCDIR}/xlocale - mkdir -p ${LOCINCDIR} - ${INSTALL} -c -m 444 ${LOCALHDRS} ${LOCINCDIR} - mkdir -p ${PRIVHDRS}/architecture/ppc - 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 444 ${PRIV_INSTHDRS} ${PRIVHDRS} - ${INSTALL} -c -m 444 ${SRCROOT}/ppc/sys/processor_facilities.h ${PRIVHDRS}/architecture/ppc - ${INSTALL} -c -m 444 ${SYMROOT}/btree.h ${PRIVHDRS}/btree - ${INSTALL} -c -m 444 ${SYMROOT}/bt_extern.h ${PRIVHDRS}/btree - ${INSTALL} -c -m 444 ${SRCROOT}/internat/NXCType.h ${PRIVHDRS}/objc - mv ${DESTDIR}/usr/include/asm.h ${PRIVHDRS}/machine - mv ${INCDIR}/servers/srvbootstrap.h ${INCDIR}/servers/bootstrap.h - @for i in `find ${DESTDIR}/usr/include/mach ${DESTDIR}/usr/include/servers -name \*.h`; do \ - x=`fgrep '' $$i | uniq -d`; \ - if [ -n "$$x" ]; then \ - echo patching $$i; \ - ed - $$i < ${SRCROOT}/fixdups.ed; \ - fi; \ + +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 - ${INSTALL} -c -m 444 ${SYS_INSTHDRS} ${PRIVHDRS}/sys - ${INSTALL} -c -m 444 ${PRIVUUID_INSTHDRS} ${PRIVHDRS}/uuid - ${INSTALL} -c -m 444 ${PRIVUUID_INSTHDRS} ${PRIVKERNELHDRS}/uuid - ${INSTALL} -c -m 444 ${INSTHDRS_AUTOPATCH:S,^,${SYMROOT}/,} ${INCDIR} -.for _h in ${STRIP_HDRS} - chmod u+w ${INCDIR}/${_h} - ed - ${INCDIR}/${_h} < ${.CURDIR}/strip-header.ed - chmod u-w ${INCDIR}/${_h} -.endfor install_lib${LIB}_static.a: - ${INSTALL} -c -m 444 lib${LIB}_static.a ${DESTDIR}/usr/local/lib/system/ + ${INSTALL} -m ${INSTALLMODE} lib${LIB}_static.a ${DESTDIR}/usr/local/lib/system/ install_lib${LIB}_profile.a: - ${INSTALL} -c -m 444 lib${LIB}_profile.a ${DESTDIR}/usr/local/lib/system + ${INSTALL} -m ${INSTALLMODE} lib${LIB}_profile.a ${DESTDIR}/usr/local/lib/system install_lib${LIB}_debug.a: - ${INSTALL} -c -m 444 lib${LIB}_debug.a ${DESTDIR}/usr/local/lib/system/ + ${INSTALL} -m ${INSTALLMODE} lib${LIB}_debug.a ${DESTDIR}/usr/local/lib/system/ install_lib${LIB}.a: - ${INSTALL} -c -m 444 lib${LIB}.a ${DESTDIR}/usr/local/lib/system/ + ${INSTALL} -m ${INSTALLMODE} lib${LIB}.a ${DESTDIR}/usr/local/lib/system/ + +autopatch: ${AUTOPATCHHDRS} ${AUTOPATCHSRCS} ${AUTOPATCHMAN} -autopatch: autopatchhdrs ${AUTOPATCHSRCS} -autopatchhdrs: ${AUTOPATCHHDRS} -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 +.endif clean: - rm -f ${OBJS} ${POBJS} ${DOBJS} ${SOBJS} ${CLEANFILES} - rm -f lib${LIB}.a lib${LIB}_static.a lib${LIB}_profile.a \ + ${RM} ${OBJS} ${POBJS} ${DOBJS} ${SOBJS} ${CLEANFILES} + ${RM} lib${LIB}.a lib${LIB}_static.a lib${LIB}_profile.a \ lib${LIB}_debug.a