From 5eebdebec89aa4a6041cf1eb4b72a74bbd669db4 Mon Sep 17 00:00:00 2001 From: Colin Davidson Date: Wed, 9 Mar 2022 05:09:39 -0800 Subject: Make llvm-config build more general for linux --- Makefile | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index ceff3c207..e77acea93 100644 --- a/Makefile +++ b/Makefile @@ -30,25 +30,29 @@ ifeq ($(OS), Darwin) ifeq ($(shell $(LLVM_CONFIG) --version | grep -E $(LLVM_VERSION_PATTERN)),) ifeq ($(ARCH), arm64) $(error "Requirement: llvm-config must be base version 13 for arm64") - else + else $(error "Requirement: llvm-config must be base version greater than 11 for amd64/x86") - endif - endif + endif + endif LDFLAGS:=$(LDFLAGS) -liconv -ldl CFLAGS:=$(CFLAGS) $(shell $(LLVM_CONFIG) --cxxflags --ldflags) 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 - else ifneq ($(shell which llvm-config-11-64 2>/dev/null),) - LLVM_CONFIG=llvm-config-11-64 - else - ifeq ($(shell $(LLVM_CONFIG) --version | grep '^11\.'),) - $(error "Requirement: llvm-config must be version 11") - endif + LLVM_CONFIG=llvm-config + + LLVM_VERSIONS = "13.%.%" "12.0.1" "11.1.0" + + LLVM_VERSION_PATTERN_SEPERATOR = )|( + LLVM_VERSION_PATTERNS_ESCAPED_DOT = $(subst .,\.,$(LLVM_VERSIONS)) + LLVM_VERSION_PATTERNS_REPLACE_PERCENT = $(subst %,.*,$(LLVM_VERSION_PATTERNS_ESCAPED_DOT)) + LLVM_VERSION_PATTERN_REMOVE_ELEMENTS = $(subst " ",$(LLVM_VERSION_PATTERN_SEPERATOR),$(LLVM_VERSION_PATTERNS_REPLACE_PERCENT)) + LLMV_VERSION_PATTERN_REMOVE_SINGLE_STR = $(subst ",,$(LLVM_VERSION_PATTERN_REMOVE_ELEMENTS)) + LLVM_VERSION_PATTERN = "^(($(LLMV_VERSION_PATTERN_REMOVE_SINGLE_STR)))" + + ifeq ($(shell $(LLVM_CONFIG) --version | grep -E $(LLVM_VERSION_PATTERN)),) + $(error "Requirement: llvm-config must be base version greater than 11") endif LDFLAGS:=$(LDFLAGS) -ldl -- cgit v1.2.3 From 3092fb2ff3ab776290eefb8df27def79cc1fbe77 Mon Sep 17 00:00:00 2001 From: Colin Davidson Date: Wed, 9 Mar 2022 06:01:40 -0800 Subject: Add initial cut of build script --- build_odin.sh | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) create mode 100755 build_odin.sh diff --git a/build_odin.sh b/build_odin.sh new file mode 100755 index 000000000..5b3767a1a --- /dev/null +++ b/build_odin.sh @@ -0,0 +1,118 @@ +#!/bin/bash +set -eu + +GIT_SHA=$(git rev-parse --short HEAD) +DISABLED_WARNINGS="-Wno-switch -Wno-macro-redefined -Wno-unused-value" +LDFLAGS="-pthread -lm -lstdc++" +CFLAGS="-std=c++14 -DGIT_SHA=\"$GIT_SHA\"" +CFLAGS="$CFLAGS -DODIN_VERSION_RAW=\"dev-$(date +"%Y-%m")\"" +CC=clang +OS=$(uname) + +panic() { + printf "%s\n" "$1" + exit 1 +} + +config_darwin() { + ARCH=$(uname -m) + LLVM_CONFIG=llvm-config + + # allow for arm only llvm's with version 13 + if [ ARCH == arm64 ]; then + LLVM_VERSIONS="13.%.%" + else + # allow for x86 / amd64 all llvm versions begining from 11 + LLVM_VERSIONS="13.%.%" "12.0.1" "11.1.0" + fi + + if [ $($LLVM_CONFIG --version | grep -E $(LLVM_VERSION_PATTERN)) == 0 ]; then + if [ ARCH == arm64 ]; then + panic "Requirement: llvm-config must be base version 13 for arm64" + else + panic "Requirement: llvm-config must be base version greater than 11 for amd64/x86" + fi + fi + + LDFLAGS="$LDFLAGS -liconv -ldl" + CFLAGS="$CFLAGS $($LLVM_CONFIG --cxxflags --ldflags)" + LDFLAGS="$LDFLAGS -lLLVM-C" +} + +config_openbsd() { + LLVM_CONFIG=/usr/local/bin/llvm-config + + LDFLAGS="$LDFLAGS -liconv" + CFLAGS="$CFLAGS $($LLVM_CONFIG --cxxflags --ldflags)" + LDFLAGS="$LDFLAGS $($LLVM_CONFIG --libs core native --system-libs)" +} + +config_linux() { + LLVM_CONFIG=llvm-config + + LDFLAGS="$LDFLAGS -ldl" + CFLAGS="$CFLAGS $($LLVM_CONFIG --cxxflags --ldflags)" + LDFLAGS="$LDFLAGS $($LLVM_CONFIG --libs core native --system-libs)" +} + +build_odin() { + set -x + $CC src/main.cpp src/libtommath.cpp $DISABLED_WARNINGS $CFLAGS $EXTRAFLAGS $LDFLAGS -o odin + set +x +} + +run_demo() { + ./odin run examples/demo/demo.odin +} + +case $OS in +Linux) + config_linux + ;; +Darwin) + config_darwin + ;; +OpenBSD) + config_openbsd + ;; +esac + +if [[ $# -eq 0 ]]; then + EXTRAFLAGS="-g" + + build_odin + run_demo + + exit 0 +fi + +if [[ $# -eq 1 ]]; then + case $1 in + report) + EXTRAFLAGS="-g" + build_odin + ./odin report + exit 0 + ;; + debug) + EXTRAFLAGS="-g" + ;; + release) + EXTRAFLAGS="-O3" + ;; + release_native) + EXTRAFLAGS="-O3 -march=native" + ;; + nightly) + EXTRAFLAGS="-DNIGHTLY -O3" + ;; + *) + panic "Unsupported build option!" + ;; + esac + + build_odin + run_demo + + exit 0 +fi -- cgit v1.2.3 From d1477bcfa74fbc04813ceff4e603c1c982fd4d33 Mon Sep 17 00:00:00 2001 From: Colin Davidson Date: Wed, 9 Mar 2022 06:07:19 -0800 Subject: Fix wonky copied space issues --- build_odin.sh | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/build_odin.sh b/build_odin.sh index 5b3767a1a..e836cb0ac 100755 --- a/build_odin.sh +++ b/build_odin.sh @@ -16,43 +16,43 @@ panic() { config_darwin() { ARCH=$(uname -m) - LLVM_CONFIG=llvm-config + LLVM_CONFIG=llvm-config - # allow for arm only llvm's with version 13 + # allow for arm only llvm's with version 13 if [ ARCH == arm64 ]; then - LLVM_VERSIONS="13.%.%" + LLVM_VERSIONS="13.%.%" else - # allow for x86 / amd64 all llvm versions begining from 11 - LLVM_VERSIONS="13.%.%" "12.0.1" "11.1.0" + # allow for x86 / amd64 all llvm versions begining from 11 + LLVM_VERSIONS="13.%.%" "12.0.1" "11.1.0" fi if [ $($LLVM_CONFIG --version | grep -E $(LLVM_VERSION_PATTERN)) == 0 ]; then if [ ARCH == arm64 ]; then - panic "Requirement: llvm-config must be base version 13 for arm64" + panic "Requirement: llvm-config must be base version 13 for arm64" else panic "Requirement: llvm-config must be base version greater than 11 for amd64/x86" fi - fi + fi - LDFLAGS="$LDFLAGS -liconv -ldl" - CFLAGS="$CFLAGS $($LLVM_CONFIG --cxxflags --ldflags)" - LDFLAGS="$LDFLAGS -lLLVM-C" + LDFLAGS="$LDFLAGS -liconv -ldl" + CFLAGS="$CFLAGS $($LLVM_CONFIG --cxxflags --ldflags)" + LDFLAGS="$LDFLAGS -lLLVM-C" } config_openbsd() { - LLVM_CONFIG=/usr/local/bin/llvm-config + LLVM_CONFIG=/usr/local/bin/llvm-config - LDFLAGS="$LDFLAGS -liconv" - CFLAGS="$CFLAGS $($LLVM_CONFIG --cxxflags --ldflags)" - LDFLAGS="$LDFLAGS $($LLVM_CONFIG --libs core native --system-libs)" + LDFLAGS="$LDFLAGS -liconv" + CFLAGS="$CFLAGS $($LLVM_CONFIG --cxxflags --ldflags)" + LDFLAGS="$LDFLAGS $($LLVM_CONFIG --libs core native --system-libs)" } config_linux() { - LLVM_CONFIG=llvm-config + LLVM_CONFIG=llvm-config - LDFLAGS="$LDFLAGS -ldl" - CFLAGS="$CFLAGS $($LLVM_CONFIG --cxxflags --ldflags)" - LDFLAGS="$LDFLAGS $($LLVM_CONFIG --libs core native --system-libs)" + LDFLAGS="$LDFLAGS -ldl" + CFLAGS="$CFLAGS $($LLVM_CONFIG --cxxflags --ldflags)" + LDFLAGS="$LDFLAGS $($LLVM_CONFIG --libs core native --system-libs)" } build_odin() { -- cgit v1.2.3 From 005d52cab7db883269e325ca8c0bb9e56a6e542e Mon Sep 17 00:00:00 2001 From: Colin Davidson Date: Wed, 9 Mar 2022 06:08:48 -0800 Subject: more spacing issues --- build_odin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_odin.sh b/build_odin.sh index e836cb0ac..634e4aa7f 100755 --- a/build_odin.sh +++ b/build_odin.sh @@ -26,7 +26,7 @@ config_darwin() { LLVM_VERSIONS="13.%.%" "12.0.1" "11.1.0" fi - if [ $($LLVM_CONFIG --version | grep -E $(LLVM_VERSION_PATTERN)) == 0 ]; then + if [ $($LLVM_CONFIG --version | grep -E $(LLVM_VERSION_PATTERN)) == 0 ]; then if [ ARCH == arm64 ]; then panic "Requirement: llvm-config must be base version 13 for arm64" else -- cgit v1.2.3 From f5cc8bd7bf0071d46fb39091a23fe19def22c02b Mon Sep 17 00:00:00 2001 From: Colin Davidson Date: Wed, 9 Mar 2022 06:14:30 -0800 Subject: only build odin for report when necessary --- build_odin.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build_odin.sh b/build_odin.sh index 634e4aa7f..77d69a6e5 100755 --- a/build_odin.sh +++ b/build_odin.sh @@ -89,8 +89,11 @@ fi if [[ $# -eq 1 ]]; then case $1 in report) - EXTRAFLAGS="-g" - build_odin + if [[ ! -f "./odin" ]]; then + EXTRAFLAGS="-g" + build_odin + fi + ./odin report exit 0 ;; -- cgit v1.2.3 From db169a4334862a8e49b7492452e4da51aeee814a Mon Sep 17 00:00:00 2001 From: Colin Davidson Date: Wed, 9 Mar 2022 06:26:25 -0800 Subject: Cleanup build mode selection --- build_odin.sh | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/build_odin.sh b/build_odin.sh index 77d69a6e5..dac89acf7 100755 --- a/build_odin.sh +++ b/build_odin.sh @@ -56,6 +56,23 @@ config_linux() { } build_odin() { + case $1 in + debug) + EXTRAFLAGS="-g" + ;; + release) + EXTRAFLAGS="-O3" + ;; + release-native) + EXTRAFLAGS="-O3 -march=native" + ;; + nightly) + EXTRAFLAGS="-DNIGHTLY -O3" + ;; + *) + panic "Build mode unsupported!" + esac + set -x $CC src/main.cpp src/libtommath.cpp $DISABLED_WARNINGS $CFLAGS $EXTRAFLAGS $LDFLAGS -o odin set +x @@ -75,14 +92,13 @@ Darwin) OpenBSD) config_openbsd ;; +*) + panic "Platform unsupported!" esac if [[ $# -eq 0 ]]; then - EXTRAFLAGS="-g" - - build_odin + build_odin debug run_demo - exit 0 fi @@ -90,32 +106,17 @@ if [[ $# -eq 1 ]]; then case $1 in report) if [[ ! -f "./odin" ]]; then - EXTRAFLAGS="-g" - build_odin + build_odin debug fi ./odin report exit 0 ;; - debug) - EXTRAFLAGS="-g" - ;; - release) - EXTRAFLAGS="-O3" - ;; - release_native) - EXTRAFLAGS="-O3 -march=native" - ;; - nightly) - EXTRAFLAGS="-DNIGHTLY -O3" - ;; *) - panic "Unsupported build option!" + build_odin $1 ;; esac - build_odin run_demo - exit 0 fi -- cgit v1.2.3 From d5b0632e4f7aa289c2876d6248508bff6e68a7b5 Mon Sep 17 00:00:00 2001 From: Colin Davidson Date: Wed, 9 Mar 2022 06:27:52 -0800 Subject: add handling for too many args --- build_odin.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build_odin.sh b/build_odin.sh index dac89acf7..8cd0849a7 100755 --- a/build_odin.sh +++ b/build_odin.sh @@ -119,4 +119,6 @@ if [[ $# -eq 1 ]]; then run_demo exit 0 +else + panic "Too many arguments!" fi -- cgit v1.2.3 From 9aea990184b35dadbd786b70730111735fb4fc0a Mon Sep 17 00:00:00 2001 From: Colin Davidson Date: Wed, 9 Mar 2022 06:49:52 -0800 Subject: clean up osx semver handling in build --- build_odin.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/build_odin.sh b/build_odin.sh index 8cd0849a7..80c35dc44 100755 --- a/build_odin.sh +++ b/build_odin.sh @@ -14,19 +14,21 @@ panic() { exit 1 } +function version { echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }'; } + config_darwin() { ARCH=$(uname -m) LLVM_CONFIG=llvm-config # allow for arm only llvm's with version 13 if [ ARCH == arm64 ]; then - LLVM_VERSIONS="13.%.%" + MIN_LLVM_VERSION=("13.0.0") else # allow for x86 / amd64 all llvm versions begining from 11 - LLVM_VERSIONS="13.%.%" "12.0.1" "11.1.0" + MIN_LLVM_VERSION=("11.1.0") fi - if [ $($LLVM_CONFIG --version | grep -E $(LLVM_VERSION_PATTERN)) == 0 ]; then + if [ $(version $($LLVM_CONFIG --version)) -lt $(version $MIN_LLVM_VERSION) ]; then if [ ARCH == arm64 ]; then panic "Requirement: llvm-config must be base version 13 for arm64" else -- cgit v1.2.3 From 34a9f55f3771c05695f3e4c886b7c067d7aec5e2 Mon Sep 17 00:00:00 2001 From: Colin Davidson Date: Wed, 9 Mar 2022 06:52:22 -0800 Subject: Update ci to use build script --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 412587b3c..cbe3fc08c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ jobs: - name: Download LLVM, botan run: sudo apt-get install llvm-11 clang-11 llvm libbotan-2-dev botan - name: build odin - run: make release + run: ./build_odin.sh release - name: Odin version run: ./odin version timeout-minutes: 1 @@ -55,7 +55,7 @@ jobs: TMP_PATH=$(xcrun --show-sdk-path)/user/include echo "CPATH=$TMP_PATH" >> $GITHUB_ENV - name: build odin - run: make release + run: ./build_odin.sh release - name: Odin version run: ./odin version timeout-minutes: 1 -- cgit v1.2.3 From c543ecd64c0681a7dc92fd3edef670380a24756e Mon Sep 17 00:00:00 2001 From: Colin Davidson Date: Wed, 9 Mar 2022 06:57:59 -0800 Subject: Try to find llvm-config-11 on goofy misconfigured CI box --- build_odin.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/build_odin.sh b/build_odin.sh index 80c35dc44..911e8a2d5 100755 --- a/build_odin.sh +++ b/build_odin.sh @@ -52,6 +52,15 @@ config_openbsd() { config_linux() { LLVM_CONFIG=llvm-config + MIN_LLVM_VERSION=("11.1.0") + if [ $(version $($LLVM_CONFIG --version)) -lt $(version $MIN_LLVM_VERSION) ]; then + + LLVM_CONFIG=llvm-config-11 + if [ $(version $($LLVM_CONFIG --version)) -lt $(version $MIN_LLVM_VERSION) ]; then + panic "Requirement: llvm-config must be base version greater than 11" + fi + fi + LDFLAGS="$LDFLAGS -ldl" CFLAGS="$CFLAGS $($LLVM_CONFIG --cxxflags --ldflags)" LDFLAGS="$LDFLAGS $($LLVM_CONFIG --libs core native --system-libs)" -- cgit v1.2.3 From 7adaa4dc2b3784997ad38e499133bdfe4651c02c Mon Sep 17 00:00:00 2001 From: Colin Davidson Date: Wed, 9 Mar 2022 07:15:08 -0800 Subject: refix make, adjust build for CI weirdness --- Makefile | 22 +++++++++------------- build_odin.sh | 16 ++++++++++------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index e77acea93..8de6ff06b 100644 --- a/Makefile +++ b/Makefile @@ -40,19 +40,15 @@ ifeq ($(OS), Darwin) LDFLAGS:=$(LDFLAGS) -lLLVM-C endif ifeq ($(OS), Linux) - LLVM_CONFIG=llvm-config - - LLVM_VERSIONS = "13.%.%" "12.0.1" "11.1.0" - - LLVM_VERSION_PATTERN_SEPERATOR = )|( - LLVM_VERSION_PATTERNS_ESCAPED_DOT = $(subst .,\.,$(LLVM_VERSIONS)) - LLVM_VERSION_PATTERNS_REPLACE_PERCENT = $(subst %,.*,$(LLVM_VERSION_PATTERNS_ESCAPED_DOT)) - LLVM_VERSION_PATTERN_REMOVE_ELEMENTS = $(subst " ",$(LLVM_VERSION_PATTERN_SEPERATOR),$(LLVM_VERSION_PATTERNS_REPLACE_PERCENT)) - LLMV_VERSION_PATTERN_REMOVE_SINGLE_STR = $(subst ",,$(LLVM_VERSION_PATTERN_REMOVE_ELEMENTS)) - LLVM_VERSION_PATTERN = "^(($(LLMV_VERSION_PATTERN_REMOVE_SINGLE_STR)))" - - ifeq ($(shell $(LLVM_CONFIG) --version | grep -E $(LLVM_VERSION_PATTERN)),) - $(error "Requirement: llvm-config must be base version greater than 11") + LLVM_CONFIG=llvm-config-11 + ifneq ($(shell which llvm-config-11 2>/dev/null),) + LLVM_CONFIG=llvm-config-11 + else ifneq ($(shell which llvm-config-11-64 2>/dev/null),) + LLVM_CONFIG=llvm-config-11-64 + else + ifeq ($(shell $(LLVM_CONFIG) --version | grep '^11\.'),) + $(error "Requirement: llvm-config must be version 11") + endif endif LDFLAGS:=$(LDFLAGS) -ldl diff --git a/build_odin.sh b/build_odin.sh index 911e8a2d5..c707f4e67 100755 --- a/build_odin.sh +++ b/build_odin.sh @@ -50,15 +50,19 @@ config_openbsd() { } config_linux() { - LLVM_CONFIG=llvm-config + if which llvm-config > /dev/null 2>&1; then + LLVM_CONFIG=llvm-config + elif which llvm-config-11 > /dev/null 2>&1; then + LLVM_CONFIG=llvm-config-11 + elif which llvm-config-11-64 > /dev/null 2>&1; then + LLVM_CONFIG=llvm-config-11-64 + else + panic "Unable to find LLVM-config" + fi MIN_LLVM_VERSION=("11.1.0") if [ $(version $($LLVM_CONFIG --version)) -lt $(version $MIN_LLVM_VERSION) ]; then - - LLVM_CONFIG=llvm-config-11 - if [ $(version $($LLVM_CONFIG --version)) -lt $(version $MIN_LLVM_VERSION) ]; then - panic "Requirement: llvm-config must be base version greater than 11" - fi + panic "Requirement: llvm-config must be base version greater than 11" fi LDFLAGS="$LDFLAGS -ldl" -- cgit v1.2.3 From 3bd1ac4c82a0e6944f3218ad38c4f5f5995d703e Mon Sep 17 00:00:00 2001 From: Colin Davidson Date: Wed, 9 Mar 2022 07:18:41 -0800 Subject: test adjusting apt arg order --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cbe3fc08c..d5179e51b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: Download LLVM, botan - run: sudo apt-get install llvm-11 clang-11 llvm libbotan-2-dev botan + run: sudo apt-get install llvm llvm-11 clang-11 libbotan-2-dev botan - name: build odin run: ./build_odin.sh release - name: Odin version -- cgit v1.2.3 From 1306c53fb1829b3454c795bf923c8c7f6f3c4483 Mon Sep 17 00:00:00 2001 From: Colin Davidson Date: Wed, 9 Mar 2022 07:21:19 -0800 Subject: more build tweaks? --- build_odin.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build_odin.sh b/build_odin.sh index c707f4e67..dc6434e19 100755 --- a/build_odin.sh +++ b/build_odin.sh @@ -62,6 +62,7 @@ config_linux() { MIN_LLVM_VERSION=("11.1.0") if [ $(version $($LLVM_CONFIG --version)) -lt $(version $MIN_LLVM_VERSION) ]; then + echo "Tried to use " $(which $LLVM_CONFIG) "version" $($LLVM_CONFIG --version) panic "Requirement: llvm-config must be base version greater than 11" fi -- cgit v1.2.3 From 7f8a9587e0d375486e3b45f9627463b8ec9421a1 Mon Sep 17 00:00:00 2001 From: Colin Davidson Date: Wed, 9 Mar 2022 07:22:48 -0800 Subject: more build tweaks? --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d5179e51b..a7aa1b265 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: Download LLVM, botan - run: sudo apt-get install llvm llvm-11 clang-11 libbotan-2-dev botan + run: sudo apt-get install llvm-11 clang-11 libbotan-2-dev botan - name: build odin run: ./build_odin.sh release - name: Odin version -- cgit v1.2.3 From a2250a5d4918498f6c68423c7dcd02c1910ceaec Mon Sep 17 00:00:00 2001 From: Colin Davidson Date: Wed, 9 Mar 2022 07:24:49 -0800 Subject: lower minimum llvm version --- build_odin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_odin.sh b/build_odin.sh index dc6434e19..11d098952 100755 --- a/build_odin.sh +++ b/build_odin.sh @@ -60,7 +60,7 @@ config_linux() { panic "Unable to find LLVM-config" fi - MIN_LLVM_VERSION=("11.1.0") + MIN_LLVM_VERSION=("11.0.0") if [ $(version $($LLVM_CONFIG --version)) -lt $(version $MIN_LLVM_VERSION) ]; then echo "Tried to use " $(which $LLVM_CONFIG) "version" $($LLVM_CONFIG --version) panic "Requirement: llvm-config must be base version greater than 11" -- cgit v1.2.3 From 2652c2d7a573cc44379d7843472b9f379246d31b Mon Sep 17 00:00:00 2001 From: Colin Davidson Date: Wed, 9 Mar 2022 07:42:38 -0800 Subject: normalize version parser --- build_odin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_odin.sh b/build_odin.sh index 11d098952..a323782a1 100755 --- a/build_odin.sh +++ b/build_odin.sh @@ -14,7 +14,7 @@ panic() { exit 1 } -function version { echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }'; } +version() { echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }'; } config_darwin() { ARCH=$(uname -m) -- cgit v1.2.3