Skip to content

Commit

Permalink
Add LLVM 3.9 builds in CI (#1210)
Browse files Browse the repository at this point in the history
This change also changes the LLVM version of prebuilt packages from 3.8
to 3.9.
  • Loading branch information
Benoit Vey authored and jemc committed Oct 20, 2016
1 parent 6ba9fd7 commit 2a52a0d
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 4 deletions.
5 changes: 3 additions & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ branches:

environment:
matrix:
- llvm: 3.9.0
- llvm: 3.8.0
- llvm: 3.7.1

Expand Down Expand Up @@ -96,7 +97,7 @@ deploy:
version: $(appveyor_build_version)
on:
branch: master
llvm: 3.8.0
llvm: 3.9.0
configuration: Release
publish: true

Expand All @@ -110,7 +111,7 @@ deploy:
version: $(appveyor_build_version)
on:
branch: release
llvm: 3.8.0
llvm: 3.9.0
configuration: Release
publish: true

Expand Down
44 changes: 42 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,32 @@ matrix:
- config=release
- CC1=gcc-5
- CXX1=g++-5
- os: linux
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-5
env:
- LLVM_VERSION="3.9.0"
- LLVM_CONFIG="llvm-config-3.9"
- config=debug
- CC1=gcc-5
- CXX1=g++-5
- os: linux
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-5
env:
- LLVM_VERSION="3.9.0"
- LLVM_CONFIG="llvm-config-3.9"
- config=release
- CC1=gcc-5
- CXX1=g++-5
- os: osx
env:
- LLVM_CONFIG="llvm-config-3.6"
Expand Down Expand Up @@ -127,6 +153,20 @@ matrix:
- lto=no
- CC1=clang-3.8
- CXX1=clang++-3.8
# LLVM 3.9 can be enabled for OSX once Homebrew supports it.
#- os: osx
# env:
# - LLVM_CONFIG="llvm-config-3.9"
# - config=debug
# - CC1=clang-3.9
# - CXX1=clang++-3.9
#- os: osx
# env:
# - LLVM_CONFIG="llvm-config-3.9"
# - config=release
# - CC1=clang-3.9
# - CXX1=clang++-3.9


rvm:
- 2.2.3
Expand All @@ -136,7 +176,7 @@ install:
# prepare to deploy artifacts.
- if [[
"$TRAVIS_REPO_SLUG" == "ponylang/ponyc" &&
"$LLVM_VERSION" == "3.8.0" &&
"$LLVM_VERSION" == "3.9.0" &&
"$config" == "release" &&
"$TRAVIS_OS_NAME" == "linux" &&
"$TRAVIS_PULL_REQUEST" == "false"
Expand Down Expand Up @@ -207,7 +247,7 @@ after_success:
# For a master release build with the latest stable LLVM, upload docs.
- if [[
"$TRAVIS_REPO_SLUG" == "ponylang/ponyc" &&
"$LLVM_VERSION" == "3.8.0" &&
"$LLVM_VERSION" == "3.9.0" &&
"$config" == "release" &&
"$TRAVIS_OS_NAME" == "linux" &&
"$TRAVIS_PULL_REQUEST" == "false" &&
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ Pony requires one of the following versions of LLVM:
- 3.6.2
- 3.7.1
- 3.8.1
- 3.9.0 (unsupported on OSX at the moment)

Compiling Pony is only possible on x86 and ARM (either 32 or 64 bits).

Expand Down
1 change: 1 addition & 0 deletions src/libponyc/codegen/gendebug.cc
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
# pragma warning(disable:4267)
# pragma warning(disable:4624)
# pragma warning(disable:4141)
# pragma warning(disable:4146)
#endif

#include <llvm/IR/DIBuilder.h>
Expand Down
1 change: 1 addition & 0 deletions src/libponyc/codegen/genopt.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
# pragma warning(disable:4267)
# pragma warning(disable:4624)
# pragma warning(disable:4141)
# pragma warning(disable:4146)
// LLVM claims DEBUG as a macro name. Conflicts with MSVC headers.
# pragma warning(disable:4005)
#endif
Expand Down

0 comments on commit 2a52a0d

Please sign in to comment.