mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-04-21 05:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update CI and Makefile and build.bat

Browse Source
This commit is contained in:
gingerBill
2021-07-10 16:30:54 +01:00
parent fa50995098
commit 3bf14fa7ec
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/ci.yml vendored
View File

@@ -7,7 +7,7 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: Download LLVM
run: sudo apt-get install llvm-11 clang-11 llvm
run: sudo apt-get install llvm-12.0.1 clang-12.0.1 llvm
- name: build odin
run: make release
- name: Odin run
@@ -22,8 +22,8 @@ jobs:
- uses: actions/checkout@v1
- name: Download LLVM and setup PATH
run: |
brew install llvm@11
echo "/usr/local/opt/llvm@11/bin" >> $GITHUB_PATH
brew install llvm@12.0.1
echo "/usr/local/opt/llvm@12.0.1/bin" >> $GITHUB_PATH
TMP_PATH=$(xcrun --show-sdk-path)/user/include
echo "CPATH=$TMP_PATH" >> $GITHUB_ENV
- name: build odin

14
Makefile
View File

@@ -9,10 +9,10 @@ OS=$(shell uname)
ifeq ($(OS), Darwin)
LLVM_CONFIG=llvm-config
ifneq ($(shell llvm-config --version | grep '^11\.'),)
ifneq ($(shell llvm-config --version | grep '^12\.'),)
LLVM_CONFIG=llvm-config
else
$(error "Requirement: llvm-config must be version 11")
$(error "Requirement: llvm-config must be version 12.0.1")
endif
LDFLAGS:=$(LDFLAGS) -liconv
@@ -20,14 +20,14 @@ ifeq ($(OS), Darwin)
LDFLAGS:=$(LDFLAGS) -lLLVM-C
endif
ifeq ($(OS), Linux)
LLVM_CONFIG=llvm-config-11
ifneq ($(shell which llvm-config-11 2>/dev/null),)
LLVM_CONFIG=llvm-config-11
LLVM_CONFIG=llvm-config-12
ifneq ($(shell which llvm-config-12 2>/dev/null),)
LLVM_CONFIG=llvm-config-12
else
ifneq ($(shell llvm-config --version | grep '^11\.'),)
ifneq ($(shell llvm-config --version | grep '^12\.'),)
LLVM_CONFIG=llvm-config
else
$(error "Requirement: llvm-config must be version 11")
$(error "Requirement: llvm-config must be version 12.0.1")
endif
endif

3
build.bat
View File

@@ -51,7 +51,8 @@ set compiler_warnings= ^
-wd4456 -wd4457 -wd4480 ^
-wd4512
set compiler_includes=
set compiler_includes= ^
/Isrc\
set libs= ^
kernel32.lib ^
bin\llvm\windows\LLVM-C.lib