diff --git a/driver/linker.cpp b/driver/linker.cpp
index 5d153eaa3e..f24d0bba7f 100644
--- a/driver/linker.cpp
+++ b/driver/linker.cpp
@@ -431,7 +431,7 @@ int linkObjToBinary(bool sharedLib)
 
 //////////////////////////////////////////////////////////////////////////////
 
-void createStaticLibrary()
+int createStaticLibrary()
 {
     Logger::println("*** Creating static library ***");
 
@@ -501,7 +501,8 @@ void createStaticLibrary()
     CreateDirectoryOnDisk(libName);
 
     // try to call archiver
-    executeToolAndWait(tool, args, global.params.verbose);
+    int rc = executeToolAndWait(tool, args, global.params.verbose);
+    return rc;
 }
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/driver/linker.h b/driver/linker.h
index 27d2979910..bb60035add 100644
--- a/driver/linker.h
+++ b/driver/linker.h
@@ -23,8 +23,9 @@ int linkObjToBinary(bool sharedLib);
 
 /**
  * Create a static library from object files.
-*/
-void createStaticLibrary();
+ * @return 0 on success.
+ */
+int createStaticLibrary();
 
 /**
  * Delete the executable that was previously linked with linkObjToBinary.
diff --git a/driver/main.cpp b/driver/main.cpp
index 3ee61e6a18..e8ceeeb0eb 100644
--- a/driver/main.cpp
+++ b/driver/main.cpp
@@ -1347,7 +1347,7 @@ int main(int argc, char **argv)
         if (global.params.link)
             status = linkObjToBinary(createSharedLib);
         else if (createStaticLib)
-            createStaticLibrary();
+            status = createStaticLibrary();
 
         if (global.params.run && status == EXIT_SUCCESS)
         {