From 3c8cda514b571b76d1bda4bc526763d88dd99485 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikkel=20Hjortsh=C3=B8j?= Date: Wed, 6 Feb 2019 18:49:21 +0100 Subject: [PATCH 1/3] Fix makefile for macOS --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 297dc8a4b..04edfc682 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ CC=clang OS=$(shell uname) -ifeq ($(OS), DARWIN) +ifeq ($(OS), Darwin) LDFLAGS=$(LDFLAGS) -liconv endif From 7343f0c7ff3d1a78b69537d7ea5b8714e9f54198 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikkel=20Hjortsh=C3=B8j?= Date: Wed, 6 Feb 2019 18:56:02 +0100 Subject: [PATCH 2/3] Fix recursive variable in makefile on macOS --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 04edfc682..7129c41e1 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ CC=clang OS=$(shell uname) ifeq ($(OS), Darwin) - LDFLAGS=$(LDFLAGS) -liconv + LDFLAGS:=$(LDFLAGS) -liconv endif all: debug demo From 24c43d33bbbc0f23d0a61b6a888339aa9a07c829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikkel=20Hjortsh=C3=B8j?= Date: Wed, 6 Feb 2019 19:08:32 +0100 Subject: [PATCH 3/3] Export LLVM path on macOS (CI) --- .travis.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d81646770..a0169259d 100644 --- a/.travis.yml +++ b/.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 \ No newline at end of file + email: false