Merge pull request #220 from jwillemsen/jwi-cleanuplinker

Simplify Embarcadero C++ bcc64x linker arguments
DOCGroup · Sep 24, 2024 · 637149e · 637149e
2 parents 402940d + 444a8e0
commit 637149e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/templates/bmake.mpd b/templates/bmake.mpd
@@ -26,7 +26,6 @@ COMMON_FLAGS = <%foreach(common_flags)%><%common_flag%><%endfor%>
 PLATFORM_LIBS_PREFIX = <%platform_libs_prefix%>
 OBJ_EXT = <%obj_ext%>
 LINKER_PATHS = <%linker_paths%>
-LINKER_PASSTHROUGH = <%linker_passthrough%>
 STARTUP_BITS = <%startup_bits%>
 LINK = <%link%>
 COMMON_LIBS = <%common_libs%>
@@ -157,10 +156,10 @@ LFLAGS   = \
 
 LIBFILES = \
 <%foreach(reverse(libs))%>
-           $(LINKER_PASSTHROUGH) <%libname_prefix%><%lib%>$(LIBMODIFIER)$(ULIBMODIFIER)$(LIB_EXT) \
+           <%libname_prefix%><%lib%>$(LIBMODIFIER)$(ULIBMODIFIER)$(LIB_EXT) \
 <%endfor%>
 <%foreach(reverse(lit_libs))%>
-           $(LINKER_PASSTHROUGH) <%lit_lib%>$(LIB_EXT) \
+           <%lit_lib%>$(LIB_EXT) \
 <%endfor%>
 <%foreach(reverse(platform_libs))%>
            $(PLATFORM_LIBS_PREFIX)<%platform_libs%> \

diff --git a/templates/bmakecommon.mpt b/templates/bmakecommon.mpt
@@ -35,7 +35,6 @@ common_flags = -a8
 obj_ext = .obj
 debug_ext = .tds
 linker_paths = -L\"$(BDS)\lib\win32\release\" -L\"$(BDS)\lib\win32\debug\"
-linker_passthrough =
 startup_bits = 32
 link = ilink32
 common_libs = ws2_32$(LIB_EXT) import32$(LIB_EXT) cw32mti$(LIB_EXT) $(CG_LIB)
@@ -68,7 +67,6 @@ common_flags = -a8
 obj_ext = .obj
 debug_ext = .tds
 linker_paths = -L\"$(BDS)\lib\win32c\debug\" -L\"$(BDS)\lib\win32c\release\"
-linker_passthrough =
 startup_bits = 32
 link = ilink32
 common_libs = ws2_32$(LIB_EXT) import32$(LIB_EXT) cw32mti$(LIB_EXT)
@@ -99,8 +97,7 @@ common_defines = WIN32 _WINDOWS WIN64
 common_flags =
 obj_ext = .o
 debug_ext = .tds
-linker_paths = -L\"$(BDS)\lib\win64\debug\" -L\"$(BDS)\lib\win64\release\" -GE:HIGHENTROPYVA=off
-linker_passthrough =
+linker_paths = -L\"$(BDS)\lib\win64\debug\" -L\"$(BDS)\lib\win64\release\"
 startup_bits = 64
 link = ilink64
 common_libs = ws2_32$(LIB_EXT) import64$(LIB_EXT) cw64mti$(LIB_EXT)
@@ -129,10 +126,9 @@ binary_flags = -tR -tD
 thr_flags = -tM
 lib_ext = .lib
 common_defines = WIN32 _WINDOWS WIN64
-common_flags = -Qunused-arguments
+common_flags =
 obj_ext = .o
 linker_paths =
-linker_passthrough = -Xlinker
 startup_bits = 64
 ccflags = -q
 link = bcc64x
@@ -142,6 +138,6 @@ tlib = tlib64
 dllflags = -tD -tR
 exeflags = -tR
 object_search_path = 0
-linker_dll_arguments = --driver-mode=g++ $(DLLFLAGS) $(UC_LFLAGS) $(LFLAGS:\=/) $(OBJFILES:\=/) -o $(OUTPUTDIR:\=/)$(NAME)$(DLL_EXT) -Xlinker --out-implib -Xlinker $(OUTPUTDIR:\=/)$(NAME).lib $(LIBFILES:\=/) $(RESOURCE:\=/)
-linker_exe_arguments = --driver-mode=g++ $(EXEFLAGS) $(UC_LFLAGS) $(LFLAGS:\=/) $(OBJFILES:\=/) -o $(OUTPUTDIR:\=/)$(NAME)$(EXE_EXT) $(LIBFILES:\=/) $(RESOURCE:\=/)
+linker_dll_arguments = $(DLLFLAGS) $(UC_LFLAGS) $(LFLAGS:\=/) $(OBJFILES:\=/) -o $(OUTPUTDIR:\=/)$(NAME)$(DLL_EXT) -Xlinker --out-implib -Xlinker $(OUTPUTDIR:\=/)$(NAME).lib $(LIBFILES:\=/) $(RESOURCE:\=/)
+linker_exe_arguments = $(EXEFLAGS) $(UC_LFLAGS) $(LFLAGS:\=/) $(OBJFILES:\=/) -o $(OUTPUTDIR:\=/)$(NAME)$(EXE_EXT) $(LIBFILES:\=/) $(RESOURCE:\=/)
 }