Style fixes:
Main ones: mostly use conditional expressions in ifdefs instead of a mixture of conditional expressions and nested ifdefs. Nearby ones: - don't do less than echo the code in the comment about libc_r - fixed some internal insertion sort errors and indentation errors.
This commit is contained in:
parent
f3e5ff4080
commit
3c23d036cc
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=129237
16
lib/Makefile
16
lib/Makefile
@ -62,13 +62,10 @@ _libsmb= libsmb
|
||||
_libvgl= libvgl
|
||||
.endif
|
||||
|
||||
# libc_r is obsolete on ia64.
|
||||
.if ${MACHINE_ARCH} != "ia64" && ${MACHINE_ARCH} != "powerpc" && \
|
||||
${MACHINE_ARCH} != "arm"
|
||||
.if !defined(NOLIBC_R)
|
||||
.if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "ia64" && \
|
||||
${MACHINE_ARCH} != "powerpc" && !defined(NOLIBC_R)
|
||||
_libc_r= libc_r
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.if ${MACHINE_ARCH} != "arm"
|
||||
_libdisk= libdisk
|
||||
@ -95,17 +92,14 @@ _libncp= libncp
|
||||
_libsmb= libsmb
|
||||
.endif
|
||||
|
||||
.if ${MACHINE_ARCH} != "powerpc"
|
||||
.if !defined(NOLIBPTHREAD)
|
||||
.if ${MACHINE_ARCH} != "powerpc" && !defined(NOLIBPTHREAD)
|
||||
_libpthread= libpthread
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "arm"
|
||||
.if !defined(NOLIBTHR)
|
||||
.if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "arm" && \
|
||||
!defined(NOLIBTHR)
|
||||
_libthr= libthr
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.if !defined(NO_USB)
|
||||
_libusbhid= libusbhid
|
||||
|
Loading…
Reference in New Issue
Block a user