hwstub: fix compile and linking ordering

Change-Id: I0acd3db2f644f4521da715d4931315bdb7548eae

2 files changed, 5 insertions, 5 deletions

diff --git a/utils/hwstub/tools/Makefile b/utils/hwstub/tools/Makefile
index 079933ad25..95eb4b72d6 100644
--- a/utils/hwstub/tools/Makefile
+++ b/utils/hwstub/tools/Makefile
@@ -8,7 +8,7 @@ REGTOOLS_LIB_DIR=../../regtools/lib
 INCLUDES=-I$(HWSTUB_INCLUDE_DIR) -I$(REGTOOLS_INCLUDE_DIR) `pkg-config --cflags lua5.2` `pkg-config --cflags libusb-1.0`
 CFLAGS=-Wall -O2  -std=c99 -g $(INCLUDES)  -D_XOPEN_SOURCE=600
 CXXFLAGS=-Wall -O2 -std=c++11 -g $(INCLUDES)
-LDFLAGS=`pkg-config --libs libusb-1.0` `pkg-config --libs lua5.2` -lreadline -L$(HWSTUB_LIB_DIR) -L$(REGTOOLS_LIB_DIR) -lsocdesc -lhwstub `xml2-config --libs` -pthread
+LDFLAGS=-lhwstub `pkg-config --libs libusb-1.0` `pkg-config --libs lua5.2` -lreadline -L$(HWSTUB_LIB_DIR) -L$(REGTOOLS_LIB_DIR) -lsocdesc `xml2-config --libs` -pthread
 EXEC=hwstub_shell hwstub_load hwstub_server hwstub_test
 SRC=$(wildcard *.c)
 SRCXX=$(wildcard *.cpp)
diff --git a/utils/hwstub/tools/hwstub_shell.cpp b/utils/hwstub/tools/hwstub_shell.cpp
index 88cb1231fb..4cd5953a50 100644
--- a/utils/hwstub/tools/hwstub_shell.cpp
+++ b/utils/hwstub/tools/hwstub_shell.cpp
@@ -74,12 +74,12 @@ void print_context(const std::string& file, const soc_desc::error_context_t& ctx
 {
     for(size_t j = 0; j < ctx.count(); j++)
     {
-        soc_desc::error_t e = ctx.get(j);
+        soc_desc::err_t e = ctx.get(j);
         switch(e.level())
         {
-            case soc_desc::error_t::INFO: printf("[INFO]"); break;
-            case soc_desc::error_t::WARNING: printf("[WARN]"); break;
-            case soc_desc::error_t::FATAL: printf("[FATAL]"); break;
+            case soc_desc::err_t::INFO: printf("[INFO]"); break;
+            case soc_desc::err_t::WARNING: printf("[WARN]"); break;
+            case soc_desc::err_t::FATAL: printf("[FATAL]"); break;
             default: printf("[UNK]"); break;
         }
         if(e.location().size() != 0)