From 661a76408a7ba032023211de32120f8dee35ced6 Mon Sep 17 00:00:00 2001
From: fros4943 <fros4943>
Date: Wed, 5 Sep 2007 13:58:08 +0000
Subject: [PATCH] changed link argument sent to makefile: instead of using
 linker, user may specify linker line including tools

---
 tools/cooja/java/se/sics/cooja/GUI.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/cooja/java/se/sics/cooja/GUI.java b/tools/cooja/java/se/sics/cooja/GUI.java
index 067db3acd..2bb7e503b 100644
--- a/tools/cooja/java/se/sics/cooja/GUI.java
+++ b/tools/cooja/java/se/sics/cooja/GUI.java
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: GUI.java,v 1.56 2007/08/22 11:23:50 fros4943 Exp $
+ * $Id: GUI.java,v 1.57 2007/09/05 13:58:08 fros4943 Exp $
  */
 
 package se.sics.cooja;
@@ -144,7 +144,7 @@ public class GUI {
   private static final String externalToolsSettingNames[] = new String[] {
       "PATH_CONTIKI", "PATH_COOJA_CORE_RELATIVE", "PATH_MAKE", "PATH_SHELL",
       "PATH_C_COMPILER", "COMPILER_ARGS", "PATH_LINKER", "PATH_NM", "NM_ARGS",
-      "PATH_OBJDUMP", "OBJDUMP_ARGS", "LINKER_ARGS_1", "LINKER_ARGS_2",
+      "PATH_OBJDUMP", "OBJDUMP_ARGS", "LINK_COMMAND_1", "LINK_COMMAND_2",
       "CONTIKI_STANDARD_PROCESSES", "CMD_GREP_PROCESSES",
       "REGEXP_PARSE_PROCESSES", "CMD_GREP_INTERFACES",
       "REGEXP_PARSE_INTERFACES", "CMD_GREP_SENSORS", "REGEXP_PARSE_SENSORS",