Export use_tools_toolchain. Change last use of have_gcc3 to

use_tools_toolchain
This commit is contained in:
matt 2003-12-09 17:57:42 +00:00
parent 10f0bf745b
commit ad4eec9581
2 changed files with 4 additions and 3 deletions

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# $NetBSD: makeobsolete,v 1.19 2003/11/25 07:19:46 dyoung Exp $ # $NetBSD: makeobsolete,v 1.20 2003/12/09 17:57:42 matt Exp $
# #
# Print out the obsolete files for a set # Print out the obsolete files for a set
# Usage: makeobsolete [-b] [-x] [-a arch] [-m machine] [-s setsdir] \ # Usage: makeobsolete [-b] [-x] [-a arch] [-m machine] [-s setsdir] \
@ -96,7 +96,8 @@ for setname in $lists; do
if [ -f $setd/lists/$setname/obsolete.${machine} ]; then if [ -f $setd/lists/$setname/obsolete.${machine} ]; then
awk -- '{print $1}' $setd/lists/$setname/obsolete.${machine} awk -- '{print $1}' $setd/lists/$setname/obsolete.${machine}
fi fi
if [ "$have_gcc3" = yes -a -f $setd/lists/$setname/obsolete.gcc ]; then if [ "$use_tools_toolchain" != yes -a \
-f $setd/lists/$setname/obsolete.gcc ]; then
awk -- '{print $1}' $setd/lists/$setname/obsolete.gcc awk -- '{print $1}' $setd/lists/$setname/obsolete.gcc
fi fi
) | egrep -v '^#' | sort -ru > $file ) | egrep -v '^#' | sort -ru > $file

View File

@ -11,7 +11,7 @@ all:
@echo machine_cpu=\${MACHINE_CPU} @echo machine_cpu=\${MACHINE_CPU}
@echo object_fmt=\${OBJECT_FMT} @echo object_fmt=\${OBJECT_FMT}
@echo toolchain_missing=\${TOOLCHAIN_MISSING} @echo toolchain_missing=\${TOOLCHAIN_MISSING}
@echo have_gcc3=\${HAVE_GCC3} @echo use_tools_toolchain=\${USE_TOOLS_TOOLCHAIN}
.if defined(USE_XF86_4) && (\${USE_XF86_4} != no) .if defined(USE_XF86_4) && (\${USE_XF86_4} != no)
@echo x11_version=4 @echo x11_version=4
.else .else