fix: use same toolchain on arm that k/n does (#95)

* fix glibc version to 2.19 by using manylinux images.
* fix aarch64 to not use `moutline-atomics` by using the same toolchain that K/N is using

Author: aajtodd

CMakeLists.txt

@@ -103,3 +103,7 @@ aws_use_package(aws-c-http)
 aws_use_package(aws-c-auth)
 aws_use_package(aws-checksums)
 
+# TODO - bundling static libraries into single static library composed of all the static libraries
+# to enable IPO/LTO. See also:
+# * https://cristianadam.eu/20190501/bundling-together-static-libraries-with-cmake/
+# * https://cmake.org/cmake/help/latest/module/CheckIPOSupported.html

aws-crt-kotlin/build.gradle.kts

@@ -2,6 +2,7 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
+import aws.sdk.kotlin.gradle.crt.CMakeBuildType
 import aws.sdk.kotlin.gradle.crt.cmakeInstallDir
 import aws.sdk.kotlin.gradle.crt.configureCrtCMakeBuild
 import aws.sdk.kotlin.gradle.crt.disableCrossCompileTargets
@@ -10,6 +11,7 @@ import aws.sdk.kotlin.gradle.kmp.IDEA_ACTIVE
 import aws.sdk.kotlin.gradle.kmp.configureKmpTargets
 import aws.sdk.kotlin.gradle.util.typedProp
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
+import org.jetbrains.kotlin.konan.target.KonanTarget
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
@@ -23,7 +25,7 @@ version = sdkVersion
 description = "Kotlin Multiplatform bindings for AWS SDK Common Runtime"
 
 // See: https://kotlinlang.org/docs/reference/opt-in-requirements.html#opting-in-to-using-api
-val optinAnnotations = listOf("kotlin.RequiresOptIn")
+val optinAnnotations = listOf("kotlin.RequiresOptIn", "kotlinx.cinterop.ExperimentalForeignApi")
 
 // KMP configuration from build plugin
 configureKmpTargets()
@@ -136,7 +138,7 @@ kotlin {
     targets.withType<KotlinNativeTarget> {
         val knTarget = this
         logger.info("configuring $knTarget: ${knTarget.name}")
-        val cmakeInstallTask = configureCrtCMakeBuild(knTarget)
+        val cmakeInstallTask = configureCrtCMakeBuild(knTarget, CMakeBuildType.Release)
         val targetInstallDir = project.cmakeInstallDir(knTarget)
         val headerDir = targetInstallDir.resolve("include")
         val libDir = targetInstallDir.resolve("lib")
@@ -148,6 +150,7 @@ kotlin {
                 defFile("$interopDir/crt.def")
                 includeDirs(headerDir)
                 compilerOpts("-L${libDir.absolutePath}")
+                extraOpts("-libraryPath", libDir.absolutePath)
             }
 
             // cinterop tasks processes header files which requires the corresponding CMake build/install to run
@@ -158,6 +161,7 @@ kotlin {
         }
 
         compilations["test"].compilerOptions.configure {
+            // TODO - can we remove this if we are bundling the static libs
             freeCompilerArgs.addAll(listOf("-linker-options", "-L${libDir.absolutePath}"))
         }
     }

aws-crt-kotlin/native/interop/crt.def

@@ -12,6 +12,17 @@ linkerOpts = -laws-c-common -laws-c-cal -laws-c-io -laws-c-http -laws-c-compress
 linkerOpts.osx = -framework Security
 linkerOpts.linux = -ls2n -lcrypto
 
+staticLibraries = libaws-c-common.a \
+        libaws-c-cal.a \
+        libaws-c-io.a \
+        libaws-c-compression.a \
+        libaws-c-sdkutils.a \
+        libaws-c-http.a \
+        libaws-c-auth.a \
+        libaws-checksums.a
+
+staticLibraries.linux = libs2n.a libcrypto.a
+
 ---
 
 // prototypes

docker-images/linux-arm64/Dockerfile

@@ -1,2 +1,11 @@
-FROM dockcross/linux-arm64:20240104-6eda627
+FROM dockcross/manylinux2014-aarch64:20240104-6eda627
 ENV DEFAULT_DOCKCROSS_IMAGE aws-crt-kotlin/linux-arm64:latest
+
+RUN curl -LJo konan-toolchain.tar.gz https://download.jetbrains.com/kotlin/native/aarch64-unknown-linux-gnu-gcc-8.3.0-glibc-2.25-kernel-4.9-2.tar.gz
+# Remove the cross compile root from the original image and put our own one based
+# on the K/N toolchain.
+RUN mv /usr/xcc/aarch64-unknown-linux-gnu /tmp/original && \
+    mkdir -p /usr/xcc/aarch64-unknown-linux-gnu && \
+    tar -xzf konan-toolchain.tar.gz -C /usr/xcc/aarch64-unknown-linux-gnu --strip-components=1 && \
+    cp /tmp/original/Toolchain.cmake /usr/xcc/aarch64-unknown-linux-gnu && \
+    rm -rf /tmp/original

docker-images/linux-x64/Dockerfile

@@ -1,2 +1,6 @@
-FROM dockcross/linux-x64:20240104-6eda627
+# We need glibc <= 2.19, see https://youtrack.jetbrains.com/issue/KT-47061
+# TODO - explore creating a custom image using the same toolchain K/N uses
+# see https://github.com/JetBrains/kotlin/tree/master/kotlin-native/tools/toolchain_builder
+# OR via https://download.jetbrains.com/kotlin/native/x86_64-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2.tar.gz
+FROM dockcross/manylinux2014-x64:20240104-6eda627
 ENV DEFAULT_DOCKCROSS_IMAGE aws-crt-kotlin/linux-x64:latest