Merge branch 'master' of https://github.com/odin-lang/Odin

2026-06-20 04:35:00 -07:00 · 2019-02-06 22:45:04 +00:00
parent 26fb1fa18c 24c43d33bb
commit 4b7a09b92e
2 changed files with 9 additions and 3 deletions
@@ -8,11 +8,17 @@ os:

 compiler:
  - clang
+ 
+addons:
+  homebrew:
+    packages:
+    - llvm

 script: 
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/llvm/bin:$PATH" ; fi
  - make release
  - ./odin run examples/demo/demo.odin
  - ./odin check examples/demo/demo.odin -vet

 notifications:
-  email: false
+  email: false
@@ -5,8 +5,8 @@ CC=clang

 OS=$(shell uname)

-ifeq ($(OS), DARWIN)
-	LDFLAGS=$(LDFLAGS) -liconv
+ifeq ($(OS), Darwin)
+	LDFLAGS:=$(LDFLAGS) -liconv
 endif

 all: debug demo