From 2e2087897136432328d71d85d5190a53f300e567 Mon Sep 17 00:00:00 2001
From: gumi <git@gumi.ca>
Date: Sat, 17 Feb 2018 13:41:26 -0500
Subject: use -ld-fuse=gold for gcc in travis

---
 .travis.yml           | 14 +++++++-------
 src/map/atcommand.cpp |  4 ----
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ccc1fe6..44153a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -86,7 +86,7 @@ matrix:
           - valgrind
           - gdb
     - compiler: gcc
-      env: REAL_CC=gcc-4.7     REAL_CXX=g++-4.7
+      env: REAL_CC=gcc-4.7     REAL_CXX=g++-4.7   LDFLAGS="-fuse-ld=gold"
       addons:
         apt:
           sources:
@@ -98,7 +98,7 @@ matrix:
           - valgrind
           - gdb
     - compiler: gcc
-      env: REAL_CC=gcc-4.8     REAL_CXX=g++-4.8
+      env: REAL_CC=gcc-4.8     REAL_CXX=g++-4.8   LDFLAGS="-fuse-ld=gold"
       addons:
         apt:
           sources:
@@ -110,7 +110,7 @@ matrix:
           - valgrind
           - gdb
     - compiler: gcc
-      env: REAL_CC=gcc-4.9     REAL_CXX=g++-4.9
+      env: REAL_CC=gcc-4.9     REAL_CXX=g++-4.9   LDFLAGS="-fuse-ld=gold"
       addons:
         apt:
           sources:
@@ -122,7 +122,7 @@ matrix:
           - valgrind
           - gdb
     - compiler: gcc
-      env: REAL_CC=gcc-5     REAL_CXX=g++-5
+      env: REAL_CC=gcc-5     REAL_CXX=g++-5   LDFLAGS="-fuse-ld=gold"
       addons:
         apt:
           sources:
@@ -136,7 +136,7 @@ matrix:
     # Can't use valgrind and asan at the same time.
     # Should probably fix the test leaks though.
     - compiler: gcc
-      env: REAL_CC=gcc-5     REAL_CXX=g++-5  REAL_EXTRA=-fsanitize=address  FORCE_TESTER='' ASAN_OPTIONS=detect_leaks=0
+      env: REAL_CC=gcc-5     REAL_CXX=g++-5  REAL_EXTRA=-fsanitize=address  FORCE_TESTER='' ASAN_OPTIONS=detect_leaks=0   LDFLAGS="-fuse-ld=gold"
       addons:
         apt:
           sources:
@@ -149,7 +149,7 @@ matrix:
           - gdb
     # LTO is buggy.
     - compiler: gcc
-      env: REAL_CC=gcc-5     REAL_CXX=g++-5  REAL_EXTRA=-flto
+      env: REAL_CC=gcc-5     REAL_CXX=g++-5  REAL_EXTRA=-flto   LDFLAGS="-fuse-ld=gold"
       addons:
         apt:
           sources:
@@ -161,7 +161,7 @@ matrix:
           - valgrind
           - gdb
   allow_failures:
-    - env: REAL_CC=gcc-5     REAL_CXX=g++-5  REAL_EXTRA=-flto
+    - env: REAL_CC=gcc-5     REAL_CXX=g++-5  REAL_EXTRA=-flto  LDFLAGS="-fuse-ld=gold"
 
 # everything that was pushed to stable was already on 'master', except
 # the version change and some doc changes.
diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp
index 294e70b..7167b63 100644
--- a/src/map/atcommand.cpp
+++ b/src/map/atcommand.cpp
@@ -4815,8 +4815,6 @@ ATCE atcommand_get_var(Session *s, dumb_ptr<map_session_data> sd,
     CharName character;
     XString vname;
     XString vindex;
-    char prefix;
-    char postfix;
 
     if (!asplit(message, &vname, &vindex, &character))
     {
@@ -4826,8 +4824,6 @@ ATCE atcommand_get_var(Session *s, dumb_ptr<map_session_data> sd,
     }
 
     dumb_ptr<map_session_data> pl_sd = map_nick2sd(character);
-    prefix = vname.front();
-    postfix = vname.back();
     SIR reg = SIR::from(variable_names.intern(vname), atoi((RString(vindex)).c_str()));
 
     struct script_data dat = ScriptDataVariable{reg};
-- 
cgit v1.2.3-70-g09d2