From b8469180f9a00c9f2f8ec032c3ff38de1729cd0f Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Sun, 23 Feb 2020 12:04:18 +0100 Subject: [PATCH] Linux builds are statically linked --- .circleci/config.yml | 1 + script/compile | 49 ++++++++++++++++++++++---------------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a7cb1471..f306e408 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -70,6 +70,7 @@ jobs: GRAALVM_HOME: /home/circleci/graalvm-ce-java8-19.3.0 BABASHKA_PLATFORM: linux # used in release script BABASHKA_TEST_ENV: native + BABASHKA_STATIC: true steps: - checkout - run: diff --git a/script/compile b/script/compile index fbb59dc7..97d41852 100755 --- a/script/compile +++ b/script/compile @@ -15,35 +15,34 @@ fi BABASHKA_VERSION=$(cat resources/BABASHKA_VERSION) -# # We also need to AOT sci, else something didn't work in the Mac build on CircleCI -# # See https://github.com/oracle/graal/issues/1613 -# ( cd /tmp; git clone https://github.com/borkdude/sci 2> /dev/null || true ) -# mkdir -p src/sci -# cp -R /tmp/sci/src/* src - export JAVA_HOME=$GRAALVM_HOME lein with-profiles +reflection do run lein do clean, uberjar -$GRAALVM_HOME/bin/native-image \ - -jar target/babashka-$BABASHKA_VERSION-standalone.jar \ - -H:Name=bb \ - -H:+ReportExceptionStackTraces \ - -J-Dclojure.spec.skip-macros=true \ - -J-Dclojure.compiler.direct-linking=true \ - "-H:IncludeResources=BABASHKA_VERSION" \ - "-H:IncludeResources=SCI_VERSION" \ - -H:ReflectionConfigurationFiles=reflection.json \ - --initialize-at-run-time=java.lang.Math\$RandomNumberGeneratorHolder \ - --initialize-at-build-time \ - -H:Log=registerResource: \ - -H:EnableURLProtocols=http,https \ - --enable-all-security-services \ - -H:+JNI \ - --verbose \ - --no-fallback \ - --no-server \ - "$BABASHKA_XMX" +args=( -jar target/babashka-$BABASHKA_VERSION-standalone.jar \ + -H:Name=bb \ + -H:+ReportExceptionStackTraces \ + -J-Dclojure.spec.skip-macros=true \ + -J-Dclojure.compiler.direct-linking=true \ + "-H:IncludeResources=BABASHKA_VERSION" \ + "-H:IncludeResources=SCI_VERSION" \ + -H:ReflectionConfigurationFiles=reflection.json \ + --initialize-at-run-time=java.lang.Math\$RandomNumberGeneratorHolder \ + --initialize-at-build-time \ + -H:Log=registerResource: \ + -H:EnableURLProtocols=http,https \ + --enable-all-security-services \ + -H:+JNI \ + --verbose \ + --no-fallback \ + --no-server \ + "$BABASHKA_XMX" ) + +if [ "$BABASHKA_STATIC" = "true" ]; then + args+=("--static") +fi + +$GRAALVM_HOME/bin/native-image "${args[@]}" lein clean