Skip to content

Commit d78c90d

Browse files
jmalakPerditionC
authored andcommitted
build: remove # comment like handling linker command
now it is handled transparent way by use of response file only if necessary that it can be changed from response file to command line passing arguments
1 parent b52fbaf commit d78c90d

File tree

6 files changed

+12
-8
lines changed

6 files changed

+12
-8
lines changed

mkfiles/bc5.mak

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ INCLUDEPATH = -I$(CC_BASE_PATH)\INCLUDE
77
CC = $(BINPATH)\BCC # Borland C++
88
CL = $(CC)
99
AR = $(BINPATH)\Tlib /C
10-
LD = $(BINPATH)\Tlink /m/s/l /c/d /i
10+
LD_RSP = command.rsp
11+
LD = $(BINPATH)\Tlink /m/s/l /c/d /i @$(LD_RSP)
1112
LIBLIST = ,
1213
ECHOLIB = echolib
1314

mkfiles/gcc.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ CC = ia16-elf-gcc -c
1515
CL = ia16-elf-gcc -mcmodel=small
1616
CLO = -o $@
1717
AR = ia16-elf-ar crsv
18-
LD = $(CL) $(CFLAGS1) -o command.exe $(OBJ1) $(OBJ2) $(OBJ3) $(OBJ4) command.ld $(LIBS) $(LIBC) -Wl,-Map,command.map \#
18+
LD = $(CL) $(CFLAGS1) -o command.exe $(OBJ1) $(OBJ2) $(OBJ3) $(OBJ4) command.ld $(LIBS) $(LIBC) -Wl,-Map,command.map
1919
LIBLIST = >
2020
ECHOLIB = echo >>
2121

mkfiles/tc2.mak

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ INCLUDEPATH = -I$(CC_BASE_PATH)\INCLUDE
55
CC = $(BINPATH)\TCC # Turbo C/C++
66
CL = $(CC)
77
AR = $(BINPATH)\Tlib /C
8-
LD = $(BINPATH)\Tlink /m/s/l /c/d
8+
LD_RSP = command.rsp
9+
LD = $(BINPATH)\Tlink /m/s/l /c/d @$(LD_RSP)
910
LIBLIST = ,
1011
ECHOLIB = echolib
1112

mkfiles/turbocpp.mak

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ INCLUDEPATH = -I$(CC_BASE_PATH)\INCLUDE
77
CC = $(BINPATH)\TCC # Turbo C/C++
88
CL = $(CC)
99
AR = $(BINPATH)\Tlib /C
10-
LD = $(BINPATH)\Tlink /m/s/l /c/d
10+
LD_RSP = command.rsp
11+
LD = $(BINPATH)\Tlink /m/s/l /c/d @$(LD_RSP)
1112
LIBLIST = ,
1213
ECHOLIB = echolib
1314

mkfiles/watcom.mak

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@ CP = cp
1616
CC_BASE_PATH = $(WATCOM)
1717
!ifdef __LINUX__
1818
BINPATH = $(CC_BASE_PATH)/binl
19-
LD = $(CL) -l=dos -fe=command.exe $(OBJ1) $(OBJ2) $(OBJ3) $(OBJ4) $(LIBS) -\"op map,statics,verbose,stack=4k\" $#
19+
LD = $(CL) -l=dos -fe=command.exe $(OBJ1) $(OBJ2) $(OBJ3) $(OBJ4) $(LIBS) -\"op map,statics,verbose,stack=4k\"
2020
!else
2121
!ifdef Win64
2222
BINPATH = $(CC_BASE_PATH)\BINNT
2323
!else
2424
BINPATH = $(CC_BASE_PATH)\BINW
2525
!endif
26-
LD = wlinker /ma/nologo
26+
LD_RSP = command.rsp
27+
LD = wlinker /ma/nologo @$(LD_RSP)
2728
!endif
2829
LIBPATH = $(CC_BASE_PATH)$(DIRSEP)lib
2930
INCLUDEPATH = -I$(CC_BASE_PATH)$(DIRSEP)h

shell/makefile.mak

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ command.rsp : echoto.bat
4343
$(ECHOTO0) command.rsp $(LIBS)+
4444
$(ECHOTO0) command.rsp $(LIBC)
4545

46-
command.exe : $(CFG) $(OBJ1) $(OBJ2) $(OBJ3) $(OBJ4) $(LIBS) command.rsp
47-
$(LD) @command.rsp
46+
command.exe : $(CFG) $(OBJ1) $(OBJ2) $(OBJ3) $(OBJ4) $(LIBS) $(LD_RSP)
47+
$(LD)

0 commit comments

Comments
 (0)