diff options
author | imp <imp@FreeBSD.org> | 2011-02-11 06:35:53 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2011-02-11 06:35:53 +0000 |
commit | febdd2ffbc8e4d9ad633968685747914f8729be4 (patch) | |
tree | dabdea6277569e16ff75b6e593a42ef769d974fb /usr.sbin | |
parent | a3b3e248db39789325b9654856811dfbabf4988b (diff) | |
download | FreeBSD-src-febdd2ffbc8e4d9ad633968685747914f8729be4.zip FreeBSD-src-febdd2ffbc8e4d9ad633968685747914f8729be4.tar.gz |
Generate MACHINE= and MACHINE_ARCH= lines based on the machine
directive. Once this is MFC'd, we can move these out of the template
files where they are (incosnsitently) defined.
MFC after: 1 week
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/config/configvers.h | 2 | ||||
-rw-r--r-- | usr.sbin/config/mkmakefile.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/usr.sbin/config/configvers.h b/usr.sbin/config/configvers.h index 322e648..6e044b8 100644 --- a/usr.sbin/config/configvers.h +++ b/usr.sbin/config/configvers.h @@ -49,5 +49,5 @@ * * $FreeBSD$ */ -#define CONFIGVERS 600011 +#define CONFIGVERS 600012 #define MAJOR_VERS(x) ((x) / 100000) diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c index 08e1b63..dd7aaa9 100644 --- a/usr.sbin/config/mkmakefile.c +++ b/usr.sbin/config/mkmakefile.c @@ -140,6 +140,8 @@ makefile(void) if (ofp == 0) err(1, "%s", path("Makefile.new")); fprintf(ofp, "KERN_IDENT=%s\n", ident); + fprintf(ofp, "MACHINE=%s\n", machinename); + fprintf(ofp, "MACHINE_ARCH=%s\n", machinearch); SLIST_FOREACH_SAFE(op, &mkopt, op_next, t) { fprintf(ofp, "%s=%s", op->op_name, op->op_value); while ((op = SLIST_NEXT(op, op_append)) != NULL) |