Merge pull request #75 from kornilova-l/static-binary

Fix #33: Configure CMake to build statically linked binary

Author: jonas

.travis.yml

@@ -27,7 +27,6 @@ matrix:
       script: scripts/docker-deploy.sh latest
       on:
         branch: master
-  - env: TEST_ENV=ubuntu-18.04-llvm-dev
   - env: TEST_ENV=ubuntu-18.04-llvm-5.0
 
 before_cache:

Dockerfile

@@ -11,17 +11,13 @@ RUN set -x \
  && apt update \
  && apt install -y --no-install-recommends \
             g++ openjdk-8-jdk-headless sbt cmake make curl git \
+            zlib1g-dev \
             libgc-dev libunwind8-dev libre2-dev \
  && rm -rf /var/lib/apt/lists/*
 
 ARG LLVM_VERSION=6.0
 ENV LLVM_VERSION=$LLVM_VERSION
-# LLVM dev versions do not have a "-x.y" version suffix.
-ARG LLVM_DEB_COMPONENT=-$LLVM_VERSION
 RUN set -x \
- && . /etc/lsb-release \
- && echo "deb https://apt.llvm.org/$DISTRIB_CODENAME/ llvm-toolchain-$DISTRIB_CODENAME$LLVM_DEB_COMPONENT main" > /etc/apt/sources.list.d/llvm.list \
- && apt-key adv --fetch-keys https://apt.llvm.org/llvm-snapshot.gpg.key \
  && apt update \
  && apt install -y --no-install-recommends \
             clang-$LLVM_VERSION clang-format-$LLVM_VERSION \

bindgen/CMakeLists.txt

@@ -1,16 +1,35 @@
 cmake_minimum_required(VERSION 3.9)
 project(scala-native-bindgen)
 
-# Locate $LLVM_PATH/lib/cmake/clang/ClangConfig.cmake
-find_package(Clang REQUIRED CONFIG)
+set(USE_SHARED OFF)
+
+# Locate LLVMConfig.cmake
+find_package(LLVM REQUIRED CONFIG)
 message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
 message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
 
+message(STATUS "Using LLVM include dirs: ${LLVM_INCLUDE_DIRS}")
 include_directories(SYSTEM ${LLVM_INCLUDE_DIRS})
+
+message(STATUS "Using LLVM defs: ${LLVM_DEFINITIONS}")
 add_definitions(${LLVM_DEFINITIONS})
 
 add_compile_options(-fexceptions -std=c++11 -Wall -Wconversion -Werror)
 
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+  # macOS does not guarantee backwards compatible system calls and therefore
+  # discourages statically linked binaries. Instead add -L/usr/lib before the
+  # LLVM LDFLAGS to link against the dynamic system libc++ instead of the one
+  # from LLVM.
+  set(BINDGEN_LINK_FLAG "-L/usr/lib")
+else()
+  set(BINDGEN_LINK_FLAG "-static")
+endif()
+message(STATUS "Using link flag: ${BINDGEN_LINK_FLAG}")
+
+message(STATUS "Using LLVM library directories: ${LLVM_LIBRARY_DIRS}")
+link_directories(${LLVM_LIBRARY_DIRS})
+
 add_executable(bindgen
   Main.cpp
   visitor/ScalaFrontendAction.h
@@ -69,10 +88,23 @@ add_executable(bindgen
 set_target_properties(bindgen
   PROPERTIES
   OUTPUT_NAME scala-native-bindgen
+  LINK_FLAGS "${BINDGEN_LINK_FLAG}"
 )
 
+llvm_map_components_to_libnames(LLVM_LIBS support core irreader object option profiledata)
+
 target_link_libraries(bindgen
   PRIVATE
   clangFrontend
   clangTooling
+  clangSerialization
+  clangDriver
+  clangParse
+  clangSema
+  clangAnalysis
+  clangEdit
+  clangAST
+  clangLex
+  clangBasic
+  ${LLVM_LIBS}
 )

bindgen/Dockerfile

@@ -11,16 +11,8 @@ RUN set -x \
  && cmake .. \
  && make
 
-ARG UBUNTU_VERSION=18.04
-FROM ubuntu:$UBUNTU_VERSION
-
-ARG LLVM_VERSION=6.0
-ENV LLVM_VERSION=$LLVM_VERSION
-RUN set -x \
- && apt update \
- && apt install -y --no-install-recommends libclang1-$LLVM_VERSION \
- && rm -rf /var/lib/apt/lists/*
+FROM scratch
 
-COPY --from=builder /src/target/scala-native-bindgen /usr/bin/scala-native-bindgen
+COPY --from=builder /src/target/scala-native-bindgen /scala-native-bindgen
 WORKDIR /src
-ENTRYPOINT ["scala-native-bindgen"]
+ENTRYPOINT ["/scala-native-bindgen"]

bindgen/Main.cpp

@@ -2,7 +2,7 @@
 #include "visitor/ScalaFrontendActionFactory.h"
 #include <clang/Tooling/CommonOptionsParser.h>
 
-int main(int argc, char *argv[]) {
+int main(int argc, const char *argv[]) {
     llvm::cl::OptionCategory Category("Binding Generator");
     llvm::cl::extrahelp CommonHelp(
         clang::tooling::CommonOptionsParser::HelpMessage);
@@ -37,7 +37,7 @@ int main(int argc, char *argv[]) {
     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::CommonOptionsParser op(argc, argv, Category);
     clang::tooling::ClangTool Tool(op.getCompilations(),
                                    op.getSourcePathList());
 

bindgen/visitor/TreeVisitor.h

@@ -26,6 +26,7 @@ class TreeVisitor : public clang::RecursiveASTVisitor<TreeVisitor> {
     TreeVisitor(clang::CompilerInstance *CI, IR &ir)
         : astContext(&(CI->getASTContext())), typeTranslator(astContext, ir),
           cycleDetection(typeTranslator), ir(ir) {}
+    virtual ~TreeVisitor() {}
 
     virtual bool VisitFunctionDecl(clang::FunctionDecl *func);
     virtual bool VisitTypedefDecl(clang::TypedefDecl *tpdef);

docker-compose.yml

@@ -10,20 +10,6 @@ services:
         - LLVM_VERSION=6.0
     entrypoint: [scala-native-bindgen]
 
-  ubuntu-18.04-llvm-dev:
-    image: scalabindgen/scala-native-bindgen-builder:ubuntu-18.04-llvm-dev
-    build:
-      context: .
-      args:
-        - UBUNTU_VERSION=18.04
-        - LLVM_VERSION=7
-        - LLVM_DEB_COMPONENT=
-    command: scripts/test.sh
-    volumes:
-      - .:/src
-      - ${HOME}/.ivy2:/root/.ivy2
-      - ${HOME}/.sbt:/root/.sbt
-
   ubuntu-18.04-llvm-6.0:
     image: scalabindgen/scala-native-bindgen-builder:ubuntu-18.04-llvm-6.0
     build: