Skip to content

Commit 911aa5f

Browse files
committed
Simplify Embarcadero C++ linker arguments
* templates/bmake.mpd: * templates/bmakecommon.mpt:
1 parent b655ffc commit 911aa5f

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

templates/bmake.mpd

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ COMMON_FLAGS = <%foreach(common_flags)%><%common_flag%><%endfor%>
2626
PLATFORM_LIBS_PREFIX = <%platform_libs_prefix%>
2727
OBJ_EXT = <%obj_ext%>
2828
LINKER_PATHS = <%linker_paths%>
29-
LINKER_PASSTHROUGH = <%linker_passthrough%>
3029
STARTUP_BITS = <%startup_bits%>
3130
LINK = <%link%>
3231
COMMON_LIBS = <%common_libs%>
@@ -157,10 +156,10 @@ LFLAGS = \
157156

158157
LIBFILES = \
159158
<%foreach(reverse(libs))%>
160-
$(LINKER_PASSTHROUGH) <%libname_prefix%><%lib%>$(LIBMODIFIER)$(ULIBMODIFIER)$(LIB_EXT) \
159+
<%libname_prefix%><%lib%>$(LIBMODIFIER)$(ULIBMODIFIER)$(LIB_EXT) \
161160
<%endfor%>
162161
<%foreach(reverse(lit_libs))%>
163-
$(LINKER_PASSTHROUGH) <%lit_lib%>$(LIB_EXT) \
162+
<%lit_lib%>$(LIB_EXT) \
164163
<%endfor%>
165164
<%foreach(reverse(platform_libs))%>
166165
$(PLATFORM_LIBS_PREFIX)<%platform_libs%> \

templates/bmakecommon.mpt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ common_flags = -a8
3535
obj_ext = .obj
3636
debug_ext = .tds
3737
linker_paths = -L\"$(BDS)\lib\win32\release\" -L\"$(BDS)\lib\win32\debug\"
38-
linker_passthrough =
3938
startup_bits = 32
4039
link = ilink32
4140
common_libs = ws2_32$(LIB_EXT) import32$(LIB_EXT) cw32mti$(LIB_EXT) $(CG_LIB)
@@ -68,7 +67,6 @@ common_flags = -a8
6867
obj_ext = .obj
6968
debug_ext = .tds
7069
linker_paths = -L\"$(BDS)\lib\win32c\debug\" -L\"$(BDS)\lib\win32c\release\"
71-
linker_passthrough =
7270
startup_bits = 32
7371
link = ilink32
7472
common_libs = ws2_32$(LIB_EXT) import32$(LIB_EXT) cw32mti$(LIB_EXT)
@@ -100,7 +98,6 @@ common_flags =
10098
obj_ext = .o
10199
debug_ext = .tds
102100
linker_paths = -L\"$(BDS)\lib\win64\debug\" -L\"$(BDS)\lib\win64\release\" -GE:HIGHENTROPYVA=off
103-
linker_passthrough =
104101
startup_bits = 64
105102
link = ilink64
106103
common_libs = ws2_32$(LIB_EXT) import64$(LIB_EXT) cw64mti$(LIB_EXT)
@@ -132,7 +129,6 @@ common_defines = WIN32 _WINDOWS WIN64
132129
common_flags = -Qunused-arguments
133130
obj_ext = .o
134131
linker_paths =
135-
linker_passthrough = -Xlinker
136132
startup_bits = 64
137133
ccflags = -q
138134
link = bcc64x

0 commit comments

Comments
 (0)