Page MenuHomeFreeBSD
Files F131589588

D24535.id70949.diff
No OneTemporary
Actions

D24535.id70949.diff
View Options

Index: usr.sbin/config/config.h
===================================================================
--- usr.sbin/config/config.h
+++ usr.sbin/config/config.h
@@ -82,6 +82,7 @@
#define NO_OBJ 2
#define BEFORE_DEPEND 4
#define NOWERROR 16
+#define NO_CTFCONVERT 32
struct device {
int d_done; /* processed */
Index: usr.sbin/config/configvers.h
===================================================================
--- usr.sbin/config/configvers.h
+++ usr.sbin/config/configvers.h
@@ -49,7 +49,7 @@
*
* $FreeBSD$
*/
-#define CONFIGVERS 600017
+#define CONFIGVERS 600018
#define MAJOR_VERS(x) ((x) / 100000)
/* Last config(8) version to require envmode/hintmode */
Index: usr.sbin/config/mkmakefile.c
===================================================================
--- usr.sbin/config/mkmakefile.c
+++ usr.sbin/config/mkmakefile.c
@@ -397,7 +397,7 @@
char *wd, *this, *compilewith, *depends, *clean, *warning;
const char *objprefix;
int compile, match, nreqs, std, filetype, not,
- imp_rule, no_obj, before_depend, nowerror;
+ imp_rule, no_ctfconvert, no_obj, before_depend, nowerror;
fp = fopen(fname, "r");
if (fp == NULL)
@@ -452,6 +452,7 @@
warning = 0;
std = 0;
imp_rule = 0;
+ no_ctfconvert = 0;
no_obj = 0;
before_depend = 0;
nowerror = 0;
@@ -479,6 +480,10 @@
nreqs = 0;
continue;
}
+ if (eq(wd, "no-ctfconvert")) {
+ no_ctfconvert++;
+ continue;
+ }
if (eq(wd, "no-obj")) {
no_obj++;
continue;
@@ -591,6 +596,8 @@
tp->f_srcprefix = "$S/";
if (imp_rule)
tp->f_flags |= NO_IMPLCT_RULE;
+ if (no_ctfconvert)
+ tp->f_flags |= NO_CTFCONVERT;
if (no_obj)
tp->f_flags |= NO_OBJ;
if (before_depend)
@@ -805,7 +812,7 @@
else
fprintf(f, "\t%s\n", compilewith);
- if (!(ftp->f_flags & NO_OBJ))
+ if (!(ftp->f_flags & (NO_OBJ|NO_CTFCONVERT)))
fprintf(f, "\t${NORMAL_CTFCONVERT}\n\n");
else
fprintf(f, "\n");

File Metadata

Mime Type
text/plain
Expires
Fri, Oct 10, 1:15 PM (20 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
23532649
Default Alt Text
D24535.id70949.diff (1 KB)

Event Timeline