epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Allow <name>_LDFLAGS.

Browse Source
This commit is contained in:
Janet B. Anderson
2003-02-10 22:52:10 +00:00
parent 4b2ddb5e80
commit e359f48237
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure/os/CONFIG.win32-x86-borland.win32-x86-borland
View File

@@ -148,7 +148,7 @@ STATIC_LDLIBS_NO=
# -w display warnings on
LINK_OPT_FLAGS_YES = -c -C -Gi -Gn -Tpd -x -w
LINK_OPT_FLAGS_NO = -c -C -Gi -Gn -Tpd -x -w-
WIN32_DLLFLAGS = $(LINK_OPT_FLAGS_$(HOST_OPT)) $(LIB_LDFLAGS)
WIN32_DLLFLAGS = $(LINK_OPT_FLAGS_$(HOST_OPT)) $(TARGET_LDFLAGS) $(LIB_LDFLAGS)
OPT_LDFLAGS =
ARCH_DEP_CFLAGS=

2
configure/os/CONFIG.win32-x86.win32-x86
View File

@@ -197,7 +197,7 @@ OP_SYS_LDLIBS =
# '-entry:_DllMainCRTStartup$(DLLENTRY)'
DLLENTRY = @12
WIN32_DLLFLAGS = /subsystem:windows /dll $(OPT_LDFLAGS) $(LIB_LDFLAGS)
WIN32_DLLFLAGS = /subsystem:windows /dll $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(LIB_LDFLAGS)
#
# specify dll .def file only if it exists

7
configure/tools/makeMakefileInclude.pl
View File

@@ -61,6 +61,13 @@ foreach $name ( @nameList ) {
print OUT "${name}_OBJS+=\$(${name}_OBJS_DEFAULT)\n";
print OUT "endif\n";
print OUT "endif\n";
print OUT "ifneq (\$(strip \$(${name}_LDFLAGS_\$(OS_CLASS))),)\n";
print OUT "${name}_LDFLAGS+=\$(subst -nil-,,\$(${name}_LDFLAGS_\$(OS_CLASS)))\n";
print OUT "else\n";
print OUT "ifdef ${name}_LDFLAGS_DEFAULT\n";
print OUT "${name}_LDFLAGS+=\$(${name}_LDFLAGS_DEFAULT)\n";
print OUT "endif\n";
print OUT "endif\n";
print OUT "ifneq (\$(strip \$(${name}_LDOBJS_\$(OS_CLASS))),)\n";
print OUT "${name}_LDOBJS+=\$(subst -nil-,,\$(${name}_LDOBJS_\$(OS_CLASS)))\n";
print OUT "else\n";