aniani/nasm
0
0
Fork 1
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-07-24 10:25:42 -04:00
Code

nasm: when generating null targets for WMAKE, add %null

Browse Source 
WMAKE wants an explicit %null directive; empty is not ok.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin 2017-08-16 22:08:36 -07:00
parent ff04a9ffe8
commit f05034fd58
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
asm/nasm.c
View File

@ -219,9 +219,11 @@ static void emit_dependencies(StrList *list)
FILE *deps; FILE *deps;
int linepos, len; int linepos, len;
StrList *l, *nl; StrList *l, *nl;
char wrapstr[] = " \\\n "; bool wmake = (quote_for_make == quote_for_wmake);
const char *wrapstr, *nulltarget;
wrapstr[1] = (quote_for_make == quote_for_wmake) ? '&' : '\\'; wrapstr = wmake ? " &\n " : " \\\n ";
nulltarget = wmake ? "\t%null\n" : "";
if (depend_file && strcmp(depend_file, "-")) { if (depend_file && strcmp(depend_file, "-")) {
deps = nasm_open_write(depend_file, NF_TEXT); deps = nasm_open_write(depend_file, NF_TEXT);
@ -239,7 +241,7 @@ static void emit_dependencies(StrList *list)
char *file = quote_for_make(l->str); char *file = quote_for_make(l->str);
len = strlen(file); len = strlen(file);
if (linepos + len > 62 && linepos > 1) { if (linepos + len > 62 && linepos > 1) {
fwrite(wrapstr, 1, sizeof wrapstr-1, deps); fputs(wrapstr, deps);
linepos = 1; linepos = 1;
} }
fprintf(deps, " %s", file); fprintf(deps, " %s", file);
@ -251,7 +253,7 @@ static void emit_dependencies(StrList *list)
list_for_each_safe(l, nl, list) { list_for_each_safe(l, nl, list) {
if (depend_emit_phony) { if (depend_emit_phony) {
char *file = quote_for_make(l->str); char *file = quote_for_make(l->str);
fprintf(deps, "%s :\n\n", file); fprintf(deps, "%s :\n%s\n", file, nulltarget);
nasm_free(file); nasm_free(file);
} }
nasm_free(l); nasm_free(l);