Changeset 3140 in kBuild for trunk/src/kmk/NMakefile.template

Timestamp:

Mar 14, 2018 9:28:10 PM (7 years ago)

Author:

bird

Message:

kmk: Merged in changes from GNU make 4.2.1 (2e55f5e4abdc0e38c1d64be703b446695e70b3b6 / ​https://git.savannah.gnu.org/git/make.git).

Location:

trunk/src/kmk

Files:

• . (modified) (1 prop)
• NMakefile.template (modified) (6 diffs)

trunk/src/kmk/NMakefile.template

@@ -4 +4 @@
 # run 'build_w32.bat' instead.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 1996-2016 Free Software Foundation, Inc.
 # This file is part of GNU Make.
 #
@@ -34 +33 @@
 
 LDFLAGS_debug = w32\subproc\WinDebug\subproc.lib /NOLOGO /SUBSYSTEM:console\
-        /INCREMENTAL:no /PDB:WinDebug/make.pdb /OUT:WinDebug/make.exe /DEBUG
+        /STACK:0x400000 /INCREMENTAL:no /PDB:WinDebug/make.pdb /OUT:WinDebug/make.exe /DEBUG
 LDFLAGS_release = w32\subproc\WinRel\subproc.lib /NOLOGO /SUBSYSTEM:console\
-        /INCREMENTAL:no /OUT:WinRel/make.exe
+        /STACK:0x400000 /INCREMENTAL:no /OUT:WinRel/make.exe
 
 all: config.h subproc Release Debug
@@ -74 +73 @@
 LIBS = kernel32.lib user32.lib advapi32.lib
 
+guile = $(OUTDIR)/guile.obj
+
 OBJS = \
         $(OUTDIR)/ar.obj \
@@ -89 +90 @@
         $(OUTDIR)/implicit.obj \
         $(OUTDIR)/job.obj \
+        $(OUTDIR)/load.obj \
         $(OUTDIR)/main.obj \
         $(OUTDIR)/misc.obj \
+        $(OUTDIR)/output.obj \
         $(OUTDIR)/read.obj \
         $(OUTDIR)/remake.obj \
@@ -103 +106 @@
         $(OUTDIR)/fnmatch.obj \
         $(OUTDIR)/dirent.obj \
-        $(OUTDIR)/pathstuff.obj
+        $(OUTDIR)/pathstuff.obj \
+        $(OUTDIR)/posixfcn.obj \
+        $(OUTDIR)/w32os.obj \
+        $(guile)
 
 $(OUTDIR)/make.exe: $(OUTDIR) $(OBJS)
@@ -119 +125 @@
 $(OUTDIR)/dirent.obj : w32/compat/dirent.c
         $(CC) $(CFLAGS) /c $?
+$(OUTDIR)/posixfcn.obj : w32/compat/posixfcn.c
+        $(CC) $(CFLAGS) /c $?
 $(OUTDIR)/pathstuff.obj : w32/pathstuff.c
         $(CC) $(CFLAGS) /c $?
+$(OUTDIR)/w32os.obj : w32/w32os.c
+        $(CC) $(CFLAGS) /c $?