Merge pull request #10 from llvm-hs/9.0

Update to build against llvm-hs-9.0

.gitignore

@@ -11,3 +11,4 @@ includes
 *.epub
 *.agdai
 .stack-work
+dist-newstyle

.travis.yml

@@ -1,5 +1,5 @@
 sudo: false
-dist: trusty
+dist: xenial
 language: generic
 
 env:
@@ -17,9 +17,8 @@ addons:
       - gcc-5
       - g++-5
       - libgmp-dev
-      - llvm-5.0-dev
     sources:
-      - llvm-toolchain-trusty-5.0
+      - llvm-toolchain-xenial-9
       - ubuntu-toolchain-r-test
 
 before_install:
@@ -28,6 +27,11 @@ before_install:
   - travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
   - export CC=/usr/bin/$GCC
   - export CXX=/usr/bin/$GXX
+  - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
+  - echo "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main" | sudo tee -a /etc/apt/sources.list
+  - sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/ppa
+  - sudo apt-get update
+  - sudo apt-get --yes install llvm-9 llvm-9-dev
 
 install:
   - stack --no-terminal --install-ghc test --only-dependencies

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2017, Stephen Diehl
+Copyright (c) 2013-2020, Stephen Diehl
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

README.md

@@ -14,11 +14,11 @@ point for the backend.
 Install
 -------
 
-Check that your installed LLVM version is precisely 5.0.
+Check that your installed LLVM version is precisely 9.0.
 
 ```bash
 $ llvm-config --version
-5.0
+9.0
 ```
 
 To build using stack:
@@ -31,14 +31,13 @@ $ stack exec main
 To build using cabal:
 
 ```bash
-$ cabal sandbox init
-$ cabal install --only-dependencies
-$ cabal build
+$ cabal new-build
 ```
 
 To run:
 
 ```bash
+$ stack run
 $ cabal run
 Preprocessing executable 'standalone' for tutorial-0.2.0.0...
 ; ModuleID = 'my cool jit'

tutorial.cabal → kaleidoscope.cabal

@@ -1,10 +1,10 @@
-name:                tutorial
+name:                kaleidoscope
 version:             0.1.0.0
 synopsis:            Standalone LLVM JIT Tutorial
 license:             MIT
 category:            Compilers
-description:         
-synopsis:            
+description:         LLVM Kaleidoscope tutorial
+synopsis:            LLVM Kaleidoscope tutorial
 license-file:        LICENSE
 author:              Stephen Diehl
 maintainer:          [email protected]
@@ -18,8 +18,8 @@ executable main
     bytestring   >= 0.10,
     mtl          >= 2.2,
     containers   >= 0.5,
-    llvm-hs      >= 5.0,
-    llvm-hs-pure >= 5.0
+    llvm-hs      >= 9.0 && < 10.0,
+    llvm-hs-pure >= 9.0 && < 10.0
 
   other-modules:
     Codegen