Add option to control use of the @native.link annotation

Author: jonas

bindgen/Main.cpp

@@ -30,6 +30,12 @@ int main(int argc, char *argv[]) {
     llvm::cl::opt<std::string> Package(
         "package", llvm::cl::cat(Category),
         llvm::cl::desc("Package name of generated Scala file"));
+    llvm::cl::opt<bool> NoLinkName(
+        "no-link", llvm::cl::cat(Category),
+        llvm::cl::desc("Library does not require linking"));
+    llvm::cl::opt<std::string> LinkName(
+        "link", llvm::cl::cat(Category),
+        llvm::cl::desc("Library to link with, e.g. -luv for libuv"));
     clang::tooling::CommonOptionsParser op(argc, (const char **)argv, Category);
     clang::tooling::ClangTool Tool(op.getCompilations(),
                                    op.getSourcePathList());
@@ -42,6 +48,14 @@ int main(int argc, char *argv[]) {
         return -1;
     }
 
+    auto linkName = LinkName.getValue();
+    if (linkName.empty()) {
+        linkName = libName;
+    }
+    if (NoLinkName.getValue()) {
+        linkName = "";
+    }
+
     auto objectName = libName;
     if (objectName == "native") {
         /* there are at most 3 objects in the file.
@@ -56,7 +70,7 @@ int main(int argc, char *argv[]) {
 
     locations.clear();
 
-    IR ir(libName, objectName, Package.getValue());
+    IR ir(libName, linkName, objectName, Package.getValue());
     ScalaFrontendActionFactory actionFactory(ir);
 
     int result = Tool.run(&actionFactory);

bindgen/ir/IR.cpp

@@ -1,10 +1,10 @@
 #include "IR.h"
 #include "../Utils.h"
 
-IR::IR(std::string libName, std::string objectName, std::string packageName)
-    : libName(std::move(libName)), objectName(std::move(objectName)),
-      packageName(packageName) {
-}
+IR::IR(std::string libName, std::string linkName, std::string objectName,
+       std::string packageName)
+    : libName(std::move(libName)), linkName(std::move(linkName)),
+      objectName(std::move(objectName)), packageName(packageName) {}
 
 void IR::addFunction(std::string name, std::vector<Parameter> parameters,
                      std::string retType, bool isVariadic) {
@@ -52,8 +52,11 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &s, const IR &ir) {
     std::string objectName = handleReservedWords(ir.objectName);
 
     if (!ir.libObjEmpty()) {
-        s << "@native.link(\"" << ir.libName << "\")\n"
-          << "@native.extern\n"
+        if (!ir.linkName.empty()) {
+            s << "@native.link(\"" << ir.linkName << "\")\n";
+        }
+
+        s << "@native.extern\n"
           << "object " << objectName << " {\n";
 
         for (const auto &typeDef : ir.typeDefs) {

bindgen/ir/IR.h

@@ -11,8 +11,8 @@
  */
 class IR {
   public:
-    explicit IR(std::string libName, std::string objectName,
-                std::string packageName);
+    explicit IR(std::string libName, std::string linkName,
+                std::string objectName, std::string packageName);
 
     void addFunction(std::string name, std::vector<Parameter> parameters,
                      std::string, bool isVariadic);
@@ -104,8 +104,9 @@ class IR {
 
     bool existsFunctionWithName(std::string functionName);
 
-    std::string libName;       // name of the library
-    std::string objectName;    // name of Scala object
+    std::string libName;    // name of the library
+    std::string linkName;   // name of the library to link with
+    std::string objectName; // name of Scala object
     std::vector<Function> functions;
     std::vector<TypeDef> typeDefs;
     std::vector<Struct> structs;