Author: imp
Date: Wed Oct 6 20:54:17 2010
New Revision: 213494
URL: http://svn.freebsd.org/changeset/base/213494
Log:
Remove hack needed by 6.x machines and older machines to run newer
makes on FreeBSD/pc98. The need for this hack has passed. If you are
one of the rare people that may need this, then you should setenv
MACHINE=pc98 as a workaround.
Modified:
head/usr.bin/make/main.c
Modified: head/usr.bin/make/main.c
==============================================================================
--- head/usr.bin/make/main.c Wed Oct 6 20:49:45 2010 (r213493)
+++ head/usr.bin/make/main.c Wed Oct 6 20:54:17 2010 (r213494)
@@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/stat.h>
-#include <sys/sysctl.h>
#include <sys/time.h>
#include <sys/queue.h>
#include <sys/resource.h>
@@ -931,26 +930,6 @@ main(int argc, char **argv)
#endif
/*
- * Prior to 7.0, FreeBSD/pc98 kernel used to set the
- * utsname.machine to "i386", and MACHINE was defined as
- * "i386", so it could not be distinguished from FreeBSD/i386.
- * Therefore, we had to check machine.ispc98 and adjust the
- * MACHINE variable. NOTE: The code is still here to be able
- * to compile new make binary on old FreeBSD/pc98 systems, and
- * have the MACHINE variable set properly.
- */
- if ((machine = getenv("MACHINE")) == NULL) {
- int ispc98;
- size_t len;
-
- len = sizeof(ispc98);
- if (!sysctlbyname("machdep.ispc98", &ispc98, &len, NULL, 0)) {
- if (ispc98)
- machine = "pc98";
- }
- }
-
- /*
* Get the name of this type of MACHINE from utsname
* so we can share an executable for similar machines.
* (i.e. m68k: amiga hp300, mac68k, sun3, ...)
@@ -958,7 +937,7 @@ main(int argc, char **argv)
* Note that both MACHINE and MACHINE_ARCH are decided at
* run-time.
*/
- if (machine == NULL) {
+ if ((machine = getenv("MACHINE")) == NULL) {
static struct utsname utsname;
if (uname(&utsname) == -1)
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
