Browse Source

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

gingerBill 6 years ago
parent
commit
4b7a09b92e
2 changed files with 9 additions and 3 deletions
  1. 7 1
      .travis.yml
  2. 2 2
      Makefile

+ 7 - 1
.travis.yml

@@ -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

+ 2 - 2
Makefile

@@ -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