Haiku/buildtools
1
0
Fork 0
mirror of https://review.haiku-os.org/buildtools synced 2024-11-23 07:18:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "jam: Fix build/run on Windows."

Browse Source 
This reverts commit 148cc99040.
It broke the build on Linux.
This commit is contained in:
Jérôme Duval 2015-08-07 17:22:32 +02:00
parent 7c3622a5de
commit f625dd9f94
4 changed files with 138 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jam/Jambase
View File

@ -197,9 +197,12 @@ if $(NT)
CCFLAGS ?= /D \"WIN\" ;
C++ ?= $(CC) ;
C++FLAGS ?= $(CCFLAGS) ;
LINK ?= link /nologo ;
LINKFLAGS ?= ;
LINKLIBS ?= ;
LINK ?= $(CC) ;
LINKFLAGS ?= $(CCFLAGS) ;
LINKLIBS ?=
$(MSVC)\\lib\\mlibce.lib
$(MSVC)\\lib\\oldnames.lib
;
LINKLIBS ?= ;
NOARSCAN ?= true ;
OPTIM ?= ;
@ -226,6 +229,7 @@ if $(NT)
LINKFLAGS ?= "" ;
LINKLIBS ?=
$(MSVCNT)\\lib\\$(I)libc.lib
$(MSVCNT)\\lib\\$(I)oldnames.lib
$(MSVCNT)\\lib\\$(I)kernel32.lib ;
OPTIM ?= "" ;
STDHDRS ?= $(MSVCNT)\\include ;
@ -2008,7 +2012,7 @@ else if $(NT) && $(MSVC)
{
actions updated together piecemeal Archive
{
$(AR) $(<) $(>)
$(AR) $(<) -+$(>)
}
actions Cc

3
jam/Makefile
View File

@ -29,7 +29,7 @@ HOST_SYSTEM=$(shell uname)
# NT (with Microsoft compiler)
# People with DevStudio settings already in shell environment.
#CC = cl /nologo
#CFLAGS = -DNT -D_CRT_SECURE_NO_WARNINGS -DWIN32_LEAN_AND_MEAN
#CFLAGS = -DNT
#TARGET = /Fejam0
#EXENAME = .\jam0.exe
@ -67,6 +67,7 @@ SOURCES = \
rules.c scan.c search.c timestamp.c variable.c
all: $(EXENAME)
LINKLIBS=$(LINKLIBS) $(EXENAME)
$(EXENAME):
$(CC) $(TARGET) $(CFLAGS) $(SOURCES) $(LINKLIBS)

1
jam/jam.h
View File

@ -94,7 +94,6 @@
# define OS_NT
# define SPLITPATH ';'
# define MAXLINE 996 /* longest 'together' actions */
# define PATH_MAX _MAX_PATH
# define USE_EXECUNIX
# define USE_PATHUNIX
# define PATH_DELIM '\\'

14
jam/jambase.c
View File

@ -32,9 +32,12 @@ const char *jambase[] = {
"CCFLAGS ?= /D \\\"WIN\\\" ;\n",
"C++ ?= $(CC) ;\n",
"C++FLAGS ?= $(CCFLAGS) ;\n",
"LINK ?= link /nologo ;\n",
"LINKFLAGS ?= ;\n",
"LINKLIBS ?= ;\n",
"LINK ?= $(CC) ;\n",
"LINKFLAGS ?= $(CCFLAGS) ;\n",
"LINKLIBS ?= \n",
"$(MSVC)\\\\lib\\\\mlibce.lib\n",
"$(MSVC)\\\\lib\\\\oldnames.lib\n",
";\n",
"LINKLIBS ?= ;\n",
"NOARSCAN ?= true ;\n",
"OPTIM ?= ;\n",
@ -55,6 +58,7 @@ const char *jambase[] = {
"LINKFLAGS ?= \"\" ;\n",
"LINKLIBS ?= \n",
"$(MSVCNT)\\\\lib\\\\$(I)libc.lib\n",
"$(MSVCNT)\\\\lib\\\\$(I)oldnames.lib\n",
"$(MSVCNT)\\\\lib\\\\$(I)kernel32.lib ;\n",
"OPTIM ?= \"\" ;\n",
"STDHDRS ?= $(MSVCNT)\\\\include ;\n",
@ -330,7 +334,7 @@ const char *jambase[] = {
"LEX ?= lex ;\n",
"LINKFLAGS ?= $(CCFLAGS) ;\n",
"LINKLIBS ?= ;\n",
"OPTIM ?= ;\n",
"OPTIM ?= -O ;\n",
"RANLIB ?= ranlib ;\n",
"YACC ?= yacc ;\n",
"YACCGEN ?= .c ;\n",
@ -1182,7 +1186,7 @@ const char *jambase[] = {
"{\n",
"actions updated together piecemeal Archive\n",
"{\n",
"$(AR) $(<) $(>)\n",
"$(AR) $(<) -+$(>)\n",
"}\n",
"actions Cc\n",
"{\n",