Skip to content

Commit

Permalink
Add FreeBSD 12 with LLVM 7 as supported platform (#3039)
Browse files Browse the repository at this point in the history
  • Loading branch information
SeanTAllen committed Feb 28, 2019
1 parent 34aecfb commit 1dc122b
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 70 deletions.
1 change: 1 addition & 0 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ skip_commits:
files:
- .bintray.sh
- .circleci/config.yml
- .cirrus.yml
- .gitattributes
- .gitignore
- .gitmodules
Expand Down
27 changes: 0 additions & 27 deletions .ci-dockerfiles/cross-llvm-3.9.1-freebsd11-x86_64/Dockerfile

This file was deleted.

21 changes: 0 additions & 21 deletions .ci-dockerfiles/cross-llvm-3.9.1-freebsd11-x86_64/README.md

This file was deleted.

14 changes: 14 additions & 0 deletions .cirrus.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
freebsd_instance:
image: freebsd-12-0-release-amd64

test_task:
install_script:
- pkg update
- pkg install -y gmake pcre2 libunwind llvm70 git
env:
matrix:
CONFIG: debug
CONFIG: release
test_script:
- gmake all config=$CONFIG -j3 default_ssl=openssl_1.1.0
- gmake test-ci config=$CONFIG default_ssl=openssl_1.1.0
16 changes: 0 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,6 @@ matrix:
env:
- RELEASE_CONFIG=yes
- RELEASE_DEBS=debian
- os: linux
env:
- VAGRANT_ENV=freebsd11-x86_64
- config=debug
- os: linux
env:
- VAGRANT_ENV=freebsd11-x86_64
- config=release
- os: linux
env:
- DOCKER_ARCH=i686
Expand Down Expand Up @@ -122,14 +114,6 @@ matrix:
- QEMU_RUNNER='qemu-aarch64-static --cpu cortex-a53 -L /usr/local/aarch64-linux-gnu/libc'
- CROSS_TUNE=cortex-a53
allow_failures:
- os: linux
env:
- VAGRANT_ENV=freebsd11-x86_64
- config=debug
- os: linux
env:
- VAGRANT_ENV=freebsd11-x86_64
- config=release
- os: linux
env:
- DOCKER_ARCH=i686
Expand Down
2 changes: 2 additions & 0 deletions Makefile-ponyc
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,8 @@ ifndef LLVM_CONFIG
LLVM_CONFIG = /usr/local/opt/llvm/bin/llvm-config
else ifneq (,$(shell which llvm-config-7.0 2> /dev/null))
LLVM_CONFIG = llvm-config-7.0
else ifneq (,$(shell which llvm-config70 2> /dev/null))
LLVM_CONFIG = llvm-config70
else ifneq (,$(shell which llvm-config-6.0 2> /dev/null))
LLVM_CONFIG = llvm-config-6.0
else ifneq (,$(shell which llvm-config-3.9 2> /dev/null))
Expand Down
8 changes: 2 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -760,16 +760,12 @@ gmake

First, install the required dependencies:

* FreeBSD 11 for amd64 (64-bit). It is extremely difficult to
coordinate the LLVM version, operating system support for atomics, and
Pony to work in harmony on FreeBSD 10 or earlier. (See additional
info below that mentions problems with 32-bit executable support.)

* Pony is currently supported on FreeBSD12 for amd64 (64-bit) using LLVM 7
* The following packages, with their installation commands:

```bash
sudo pkg install gmake
sudo pkg install llvm38
sudo pkg install llvm70
sudo pkg install pcre2
sudo pkg install libunwind
```
Expand Down

0 comments on commit 1dc122b

Please sign in to comment.