libsoft: Remove targets to generate libsoft
Remove the targets needed to make and install libsoft. Sponsored by: Netflix
This commit is contained in:
parent
72bf91e250
commit
b68d6892ba
4
Makefile
4
Makefile
@ -158,7 +158,7 @@ TGTS= all all-man buildenv buildenvvars buildkernel buildworld \
|
|||||||
makeman sysent \
|
makeman sysent \
|
||||||
_worldtmp _legacy _bootstrap-tools _cleanobj _obj \
|
_worldtmp _legacy _bootstrap-tools _cleanobj _obj \
|
||||||
_build-tools _build-metadata _cross-tools _includes _libraries \
|
_build-tools _build-metadata _cross-tools _includes _libraries \
|
||||||
build32 distribute32 install32 buildsoft distributesoft installsoft \
|
build32 distribute32 install32 \
|
||||||
builddtb xdev xdev-build xdev-install \
|
builddtb xdev xdev-build xdev-install \
|
||||||
xdev-links native-xtools native-xtools-install stageworld stagekernel \
|
xdev-links native-xtools native-xtools-install stageworld stagekernel \
|
||||||
stage-packages stage-packages-kernel stage-packages-world \
|
stage-packages stage-packages-kernel stage-packages-world \
|
||||||
@ -187,7 +187,7 @@ TGTS+= ${BITGTS}
|
|||||||
# the interactive tty prompt. The safest route is to just whitelist
|
# the interactive tty prompt. The safest route is to just whitelist
|
||||||
# the ones that benefit from it.
|
# the ones that benefit from it.
|
||||||
META_TGT_WHITELIST+= \
|
META_TGT_WHITELIST+= \
|
||||||
_* build32 buildfiles buildincludes buildkernel buildsoft \
|
_* build32 buildfiles buildincludes buildkernel \
|
||||||
buildworld everything kernel-toolchain kernel-toolchains kernel \
|
buildworld everything kernel-toolchain kernel-toolchains kernel \
|
||||||
kernels libraries native-xtools showconfig test-includes \
|
kernels libraries native-xtools showconfig test-includes \
|
||||||
test-system-compiler test-system-linker tinderbox toolchain \
|
test-system-compiler test-system-linker tinderbox toolchain \
|
||||||
|
@ -847,9 +847,6 @@ XCFLAGS+= ${BFLAGS}
|
|||||||
.if ${MK_LIB32} == "yes"
|
.if ${MK_LIB32} == "yes"
|
||||||
_LIBCOMPAT= 32
|
_LIBCOMPAT= 32
|
||||||
.include "Makefile.libcompat"
|
.include "Makefile.libcompat"
|
||||||
.elif ${MK_LIBSOFT} == "yes"
|
|
||||||
_LIBCOMPAT= SOFT
|
|
||||||
.include "Makefile.libcompat"
|
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
# META_MODE normally ignores host file changes since every build updates
|
# META_MODE normally ignores host file changes since every build updates
|
||||||
|
@ -67,18 +67,6 @@ LIB32CFLAGS= -DCOMPAT_32BIT
|
|||||||
LIB32DTRACE= ${DTRACE} -32
|
LIB32DTRACE= ${DTRACE} -32
|
||||||
LIB32WMAKEFLAGS+= -DCOMPAT_32BIT
|
LIB32WMAKEFLAGS+= -DCOMPAT_32BIT
|
||||||
|
|
||||||
# -------------------------------------------------------------------
|
|
||||||
# soft-fp world
|
|
||||||
.if ${COMPAT_ARCH:Marmv[67]*} != ""
|
|
||||||
HAS_COMPAT=SOFT
|
|
||||||
LIBSOFTCFLAGS= -DCOMPAT_SOFTFP
|
|
||||||
LIBSOFTCPUFLAGS= -mfloat-abi=softfp
|
|
||||||
LIBSOFT_MACHINE= arm
|
|
||||||
LIBSOFT_MACHINE_ARCH= ${COMPAT_ARCH}
|
|
||||||
LIBSOFTWMAKEENV= CPUTYPE=soft
|
|
||||||
LIBSOFTWMAKEFLAGS= -DCOMPAT_SOFTFP
|
|
||||||
.endif
|
|
||||||
|
|
||||||
# -------------------------------------------------------------------
|
# -------------------------------------------------------------------
|
||||||
# In the program linking case, select LIBCOMPAT
|
# In the program linking case, select LIBCOMPAT
|
||||||
.if defined(NEED_COMPAT)
|
.if defined(NEED_COMPAT)
|
||||||
@ -128,8 +116,7 @@ LIBCOMPATLDFLAGS+= -L${LIBCOMPATTMP}/usr/lib${libcompat}
|
|||||||
LIBCOMPATWMAKEENV+= MACHINE=${LIBCOMPAT_MACHINE}
|
LIBCOMPATWMAKEENV+= MACHINE=${LIBCOMPAT_MACHINE}
|
||||||
LIBCOMPATWMAKEENV+= MACHINE_ARCH=${LIBCOMPAT_MACHINE_ARCH}
|
LIBCOMPATWMAKEENV+= MACHINE_ARCH=${LIBCOMPAT_MACHINE_ARCH}
|
||||||
|
|
||||||
# -B is needed to find /usr/lib32/crti.o for GCC and /usr/libsoft/crti.o for
|
# -B is needed to find /usr/lib32/crti.o for gcc.
|
||||||
# Clang/GCC.
|
|
||||||
LIBCOMPATCFLAGS+= -B${LIBCOMPATTMP}/usr/lib${libcompat}
|
LIBCOMPATCFLAGS+= -B${LIBCOMPATTMP}/usr/lib${libcompat}
|
||||||
|
|
||||||
.if defined(WANT_COMPAT)
|
.if defined(WANT_COMPAT)
|
||||||
|
Loading…
Reference in New Issue
Block a user