mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-23 17:05:26 +02:00
Code Issues Wiki Activity

Fix for bug 62501 - Managed Shared library build fails

Browse source
This commit is contained in:
Sean Evoy 2004-05-31 22:46:54 +00:00
parent 9c8337b751
commit f509d06f05
3 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
View file

@ -591,7 +591,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
} }
buffer.append(NEWLINE); buffer.append(NEWLINE);
buffer.append(TAB + AT + ECHO + WHITESPACE + SINGLE_QUOTE + MESSAGE_START_BUILD + WHITESPACE + OUT_MACRO + SINGLE_QUOTE + NEWLINE); buffer.append(TAB + AT + ECHO + WHITESPACE + SINGLE_QUOTE + MESSAGE_START_BUILD + WHITESPACE + OUT_MACRO + SINGLE_QUOTE + NEWLINE);
buffer.append(TAB + cmd + WHITESPACE + flags + WHITESPACE + outflag + WHITESPACE + OUT_MACRO + WHITESPACE + "$(OBJS) $(USER_OBJS) $(LIBS)" + NEWLINE); //$NON-NLS-1$ buffer.append(TAB + cmd + WHITESPACE + flags + WHITESPACE + outflag + OUT_MACRO + WHITESPACE + "$(OBJS) $(USER_OBJS) $(LIBS)" + NEWLINE); //$NON-NLS-1$
buffer.append(TAB + AT + ECHO + WHITESPACE + SINGLE_QUOTE + MESSAGE_FINISH_FILE + WHITESPACE + OUT_MACRO + SINGLE_QUOTE + NEWLINE + NEWLINE); buffer.append(TAB + AT + ECHO + WHITESPACE + SINGLE_QUOTE + MESSAGE_FINISH_FILE + WHITESPACE + OUT_MACRO + SINGLE_QUOTE + NEWLINE + NEWLINE);
// Always add a clean target // Always add a clean target

6
build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
View file

@ -115,8 +115,8 @@ Option.Posix.Libs=Libraries (-l)
Option.Posix.Libsearch=Library search path (-L) Option.Posix.Libsearch=Library search path (-L)
Option.Posix.UserObjs=Other objects Option.Posix.UserObjs=Other objects
Option.Posix.Linker.Shared=Shared (-shared) Option.Posix.Linker.Shared=Shared (-shared)
Option.Posix.Linker.SOName=Shared object name (-Wl,-soname,) Option.Posix.Linker.SOName=Shared object name (-Wl,-soname=)
Option.Posix.Linker.Implib=Import Library name (-Wl,--out-implib) Option.Posix.Linker.Implib=Import Library name (-Wl,--out-implib=)
Option.Posix.Linker.Defname=DEF file name (-Wl,--output-def,) Option.Posix.Linker.Defname=DEF file name (-Wl,--output-def=)
Option.Posix.Archiver.Flags=Archiver flags Option.Posix.Archiver.Flags=Archiver flags

16
build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
View file

@ -207,14 +207,14 @@
<option <option
name="%Option.Posix.Linker.SOName" name="%Option.Posix.Linker.SOName"
category="gnu.c.link.category.shared" category="gnu.c.link.category.shared"
command="-Wl,-soname," command="-Wl,-soname="
id="gnu.c.link.option.soname" id="gnu.c.link.option.soname"
valueType="string"> valueType="string">
</option> </option>
<option <option
name="%Option.Posix.Linker.Implib" name="%Option.Posix.Linker.Implib"
category="gnu.c.link.category.shared" category="gnu.c.link.category.shared"
command="-Wl,--out-implib," command="-Wl,--out-implib="
id="gnu.c.link.option.implname" id="gnu.c.link.option.implname"
valueType="string"> valueType="string">
</option> </option>
@ -332,14 +332,14 @@
<option <option
name="%Option.Posix.Linker.SOName" name="%Option.Posix.Linker.SOName"
category="gnu.cpp.link.category.shared" category="gnu.cpp.link.category.shared"
command="-Wl,-soname," command="-Wl,-soname="
valueType="string" valueType="string"
id="gnu.cpp.link.option.soname"> id="gnu.cpp.link.option.soname">
</option> </option>
<option <option
name="%Option.Posix.Linker.Implib" name="%Option.Posix.Linker.Implib"
category="gnu.cpp.link.category.shared" category="gnu.cpp.link.category.shared"
command="-Wl,--out-implib," command="-Wl,--out-implib="
valueType="string" valueType="string"
id="gnu.cpp.link.option.implname"> id="gnu.cpp.link.option.implname">
</option> </option>
@ -1132,7 +1132,7 @@
name="%TargetName.cygw.so" name="%TargetName.cygw.so"
id="cdt.managedbuild.target.gnu.cygwin.so" id="cdt.managedbuild.target.gnu.cygwin.so"
isTest="false" isTest="false"
defaultExtension="a.dll" defaultExtension="dll"
scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultCygwinScannerInfoCollector" scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultCygwinScannerInfoCollector"
makefileGenerator="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator" makefileGenerator="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator"
isAbstract="false" isAbstract="false"
@ -1192,11 +1192,13 @@
</toolReference> </toolReference>
</configuration> </configuration>
<toolReference <toolReference
outputs="a.dll" outputPrefix="cyg"
outputs="dll,a.dll"
id="cdt.managedbuild.tool.gnu.c.linker"> id="cdt.managedbuild.tool.gnu.c.linker">
</toolReference> </toolReference>
<toolReference <toolReference
outputs="a.dll" outputPrefix="cyg"
outputs="dll,a.dll"
id="cdt.managedbuild.tool.gnu.cpp.linker"> id="cdt.managedbuild.tool.gnu.cpp.linker">
</toolReference> </toolReference>
</target> </target>