From f509d06f05f176c07edc5edd9abc89d42669de18 Mon Sep 17 00:00:00 2001
From: Sean Evoy <sevoy@ca.ibm.com>
Date: Mon, 31 May 2004 22:46:54 +0000
Subject: [PATCH] Fix for bug 62501 - Managed Shared library build fails

---
 .../makegen/gnu/GnuMakefileGenerator.java        |  2 +-
 .../plugin.properties                            |  6 +++---
 .../org.eclipse.cdt.managedbuilder.ui/plugin.xml | 16 +++++++++-------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
index e3fe65e59c9..94599f72085 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
@@ -591,7 +591,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
 		}
 		buffer.append(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);
 
 		// Always add a clean target
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties b/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
index 70b3abdf57c..a10799240a5 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
@@ -115,8 +115,8 @@ Option.Posix.Libs=Libraries (-l)
 Option.Posix.Libsearch=Library search path (-L)
 Option.Posix.UserObjs=Other objects
 Option.Posix.Linker.Shared=Shared (-shared)
-Option.Posix.Linker.SOName=Shared object name (-Wl,-soname,)
-Option.Posix.Linker.Implib=Import Library name (-Wl,--out-implib)
-Option.Posix.Linker.Defname=DEF file name (-Wl,--output-def,)
+Option.Posix.Linker.SOName=Shared object name (-Wl,-soname=)
+Option.Posix.Linker.Implib=Import Library name (-Wl,--out-implib=)
+Option.Posix.Linker.Defname=DEF file name (-Wl,--output-def=)
 
 Option.Posix.Archiver.Flags=Archiver flags
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
index 942eedaaa27..81f61d274ed 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
@@ -207,14 +207,14 @@
          <option
                name="%Option.Posix.Linker.SOName"
                category="gnu.c.link.category.shared"
-               command="-Wl,-soname,"
+               command="-Wl,-soname="
                id="gnu.c.link.option.soname"
                valueType="string">
          </option>
          <option
                name="%Option.Posix.Linker.Implib"
                category="gnu.c.link.category.shared"
-               command="-Wl,--out-implib,"
+               command="-Wl,--out-implib="
                id="gnu.c.link.option.implname"
                valueType="string">
          </option>
@@ -332,14 +332,14 @@
          <option
                name="%Option.Posix.Linker.SOName"
                category="gnu.cpp.link.category.shared"
-               command="-Wl,-soname,"
+               command="-Wl,-soname="
                valueType="string"
                id="gnu.cpp.link.option.soname">
          </option>
          <option
                name="%Option.Posix.Linker.Implib"
                category="gnu.cpp.link.category.shared"
-               command="-Wl,--out-implib,"
+               command="-Wl,--out-implib="
                valueType="string"
                id="gnu.cpp.link.option.implname">
          </option>
@@ -1132,7 +1132,7 @@
             name="%TargetName.cygw.so"
             id="cdt.managedbuild.target.gnu.cygwin.so"
             isTest="false"
-            defaultExtension="a.dll"
+            defaultExtension="dll"
             scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultCygwinScannerInfoCollector"
             makefileGenerator="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator"
             isAbstract="false"
@@ -1192,11 +1192,13 @@
             </toolReference>
          </configuration>
          <toolReference
-               outputs="a.dll"
+               outputPrefix="cyg"
+               outputs="dll,a.dll"
                id="cdt.managedbuild.tool.gnu.c.linker">
          </toolReference>
          <toolReference
-               outputs="a.dll"
+               outputPrefix="cyg"
+               outputs="dll,a.dll"
                id="cdt.managedbuild.tool.gnu.cpp.linker">
          </toolReference>
       </target>