From 9e4b0a1000074cf962ae5eccb1ae46fdef7c5cfe Mon Sep 17 00:00:00 2001 From: servostar Date: Mon, 27 May 2024 19:53:22 +0200 Subject: [PATCH] added llvm17-dev as dependency to sdk 0.2.5 --- .env | 2 +- CMakeLists.txt | 10 +++------- Dockerfile | 4 ++-- run-check-test.sh | 2 +- sdk/Dockerfile | 4 ++-- 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.env b/.env index e09c958..6eb74fb 100644 --- a/.env +++ b/.env @@ -1 +1 @@ -SDK=0.2.4-alpine-3.19.1 \ No newline at end of file +SDK=0.2.5-alpine-3.19.1 diff --git a/CMakeLists.txt b/CMakeLists.txt index 2dad620..61e1ed0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,13 +81,8 @@ pkg_search_module(GLIB REQUIRED IMPORTED_TARGET glib-2.0) # LLVM backend # # ------------------------------------------------ # -# Fetch LLVM link configuration -execute_process(COMMAND llvm-config --libs all - OUTPUT_VARIABLE LLVM_LIBS) -# Strip whitespace from output -string(STRIP "${LLVM_LIBS}" LLVM_LIBS) -# Link all targets to LLVM -link_libraries(${LLVM_LIBS}) +find_package(PkgConfig REQUIRED) +pkg_search_module(LLVM REQUIRED IMPORTED_TARGET llvm17) # ------------------------------------------------ # # Source # @@ -95,6 +90,7 @@ link_libraries(${LLVM_LIBS}) include_directories(${PROJECT_SOURCE_DIR}/src) include_directories(PRIVATE ${GLIB_INCLUDE_DIRS}) +include_directories(PRIVATE ${LLVM_INCLUDE_DIRS}) file(GLOB_RECURSE SOURCE_FILES src/*.c) diff --git a/Dockerfile b/Dockerfile index 68265d8..8e1bb7d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM servostar/gemstone:sdk-0.2.4-alpine-3.19.1 +FROM servostar/gemstone:sdk-0.2.5-alpine-3.19.1 LABEL authors="servostar" -LABEL version="0.2.4" +LABEL version="0.2.5" LABEL description="docker image for setting up the build pipeline on SDK" LABEL website="https://github.com/Servostar/gemstone" diff --git a/run-check-test.sh b/run-check-test.sh index bd7e5cc..a20f2ad 100644 --- a/run-check-test.sh +++ b/run-check-test.sh @@ -39,4 +39,4 @@ fi echo "+--------------------------------------+" echo "| COMPLETED CHECK + TESTS SUCCESSFULLY |" -echo "+--------------------------------------+" \ No newline at end of file +echo "+--------------------------------------+" diff --git a/sdk/Dockerfile b/sdk/Dockerfile index b5523b3..fb63cad 100644 --- a/sdk/Dockerfile +++ b/sdk/Dockerfile @@ -1,11 +1,11 @@ FROM alpine:3.19.1 LABEL authors="servostar" -LABEL version="0.2.4" +LABEL version="0.2.5" LABEL description="base image for building the gemstone programming language compiler" LABEL website="https://github.com/Servostar/gemstone" # install dependencies -RUN apk add build-base gcc make cmake bison flex git python3 graphviz glib glib-dev +RUN apk add build-base gcc make cmake bison flex git python3 graphviz glib glib-dev llvm17-dev # create user for build RUN adduser --disabled-password lorang