DHBW
/
gemstone
mirror of https://github.com/Servostar/gemstone.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added llvm17-dev as dependency to sdk 0.2.5

This commit is contained in:
Sven Vogel 2024-05-27 19:53:22 +02:00
parent fb6f6e9777
commit 9e4b0a1000
5 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@ -1 +1 @@
SDK=0.2.4-alpine-3.19.1 SDK=0.2.5-alpine-3.19.1

10
CMakeLists.txt
View File

@ -81,13 +81,8 @@ pkg_search_module(GLIB REQUIRED IMPORTED_TARGET glib-2.0)
# LLVM backend # # LLVM backend #
# ------------------------------------------------ # # ------------------------------------------------ #
# Fetch LLVM link configuration find_package(PkgConfig REQUIRED)
execute_process(COMMAND llvm-config --libs all pkg_search_module(LLVM REQUIRED IMPORTED_TARGET llvm17)
OUTPUT_VARIABLE LLVM_LIBS)
# Strip whitespace from output
string(STRIP "${LLVM_LIBS}" LLVM_LIBS)
# Link all targets to LLVM
link_libraries(${LLVM_LIBS})
# ------------------------------------------------ # # ------------------------------------------------ #
# Source # # Source #
@ -95,6 +90,7 @@ link_libraries(${LLVM_LIBS})
include_directories(${PROJECT_SOURCE_DIR}/src) include_directories(${PROJECT_SOURCE_DIR}/src)
include_directories(PRIVATE ${GLIB_INCLUDE_DIRS}) include_directories(PRIVATE ${GLIB_INCLUDE_DIRS})
include_directories(PRIVATE ${LLVM_INCLUDE_DIRS})
file(GLOB_RECURSE SOURCE_FILES src/*.c) file(GLOB_RECURSE SOURCE_FILES src/*.c)

4
Dockerfile
View File

@ -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 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 description="docker image for setting up the build pipeline on SDK"
LABEL website="https://github.com/Servostar/gemstone" LABEL website="https://github.com/Servostar/gemstone"

4
sdk/Dockerfile
View File

@ -1,11 +1,11 @@
FROM alpine:3.19.1 FROM alpine:3.19.1
LABEL authors="servostar" 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 description="base image for building the gemstone programming language compiler"
LABEL website="https://github.com/Servostar/gemstone" LABEL website="https://github.com/Servostar/gemstone"
# install dependencies # 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 # create user for build
RUN adduser --disabled-password lorang RUN adduser --disabled-password lorang