Skip to content

Commit 85028bd

Browse files
author
Brian J. Cardiff
authored
Use LLVM 10.0.0 on darwin omnibus builds (#97)
* Build llvm 10.0.1 * Bump osx build environment to xcode: 11.1.0 * Allow libRemarks.dylib [HealthCheck] E | 2020-08-06T17:33:43-03:00 | The following binaries have unsafe or unmet dependencies: --> /opt/llvm//lib/libRemarks.dylib [HealthCheck] E | 2020-08-06T17:33:43-03:00 | The following libraries cannot be guaranteed to be on target systems: --> @rpath/libRemarks.dylib [HealthCheck] E | 2020-08-06T17:33:43-03:00 | The precise failures were: --> /opt/llvm//lib/libRemarks.dylib DEPENDS ON: libRemarks.dylib COUNT: 1 PROVIDED BY: @rpath/libRemarks.dylib FAILED BECAUSE: Unsafe dependency * Build llvm 10.0.0 * Build llvm 6.0.1 with xcode 11.1.0 * Rebuild llvm 10.0.0 * Add llvm_bin for 10.0.0 darwin * Use llvm 10.0.0 by default in omnibus * Drop LLVM 10.0.1 sources since darwin has issues related to libxml2.tdb * Upload libyaml source to S3 pyyaml.org seems to be restricting the user agent or at least the request from our CI
1 parent 6bdf20d commit 85028bd

File tree

4 files changed

+23
-9
lines changed

4 files changed

+23
-9
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ version: 2
33
jobs:
44
omnibus_osx_llvm:
55
macos:
6-
xcode: "9.0"
6+
xcode: "11.1.0"
77
environment:
8-
LLVM_VERSION: 6.0.1
8+
LLVM_VERSION: 10.0.0
99
MACOSX_DEPLOYMENT_TARGET: 10.11
1010
shell: /bin/bash --login -eo pipefail
1111
steps:

omnibus/config/software/libyaml.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@
1717
name "libyaml"
1818
default_version '0.1.6'
1919

20-
source url: "http://pyyaml.org/download/libyaml/yaml-#{version}.tar.gz",
20+
# The sources of pyyaml are republished in S3 since pyyaml.org
21+
# seems to be restricting the user agent or the requests from our CI
22+
# http://pyyaml.org/download/libyaml/yaml-#{version}.tar.gz
23+
24+
source url: "http://crystal-lang.s3.amazonaws.com/libyaml/yaml-#{version}.tar.gz",
2125
md5: '5fe00cda18ca5daeb43762b80c38e06e'
2226

2327
relative_path "yaml-#{version}"

omnibus/config/software/llvm.rb

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
11
name "llvm"
2-
LLVM_VERSION = (ENV['LLVM_VERSION'] || "6.0.1").strip
2+
LLVM_VERSION = (ENV['LLVM_VERSION'] || "10.0.0").strip
33
default_version LLVM_VERSION
44

5-
source url: "http://releases.llvm.org/#{version}/llvm-#{version}.src.tar.xz"
6-
75
version "3.9.1" do
8-
source md5: "3259018a7437e157f3642df80f1983ea"
6+
source url: "http://releases.llvm.org/#{version}/llvm-#{version}.src.tar.xz",
7+
md5: "3259018a7437e157f3642df80f1983ea"
98
end
109

1110
version "6.0.1" do
12-
source md5: "c88c98709300ce2c285391f387fecce0"
11+
source url: "http://releases.llvm.org/#{version}/llvm-#{version}.src.tar.xz",
12+
md5: "c88c98709300ce2c285391f387fecce0"
13+
end
14+
15+
version "10.0.0" do
16+
source url: "https://github.com/llvm/llvm-project/releases/download/llvmorg-#{version}/llvm-#{version}.src.tar.xz",
17+
md5: "693cefdc49d618f828144486a18b473f"
1318
end
1419

1520
relative_path "llvm-#{version}.src"
1621

1722
whitelist_file "lib/BugpointPasses.dylib"
1823
whitelist_file "lib/libLTO.dylib"
1924
whitelist_file "lib/LLVMHello.dylib"
25+
whitelist_file "lib/libRemarks.dylib"
2026

2127
env = with_standard_compiler_flags(with_embedded_path)
2228

@@ -36,6 +42,8 @@
3642
" -DBUILD_SHARED_LIBS=OFF" \
3743
" -DLLVM_OPTIMIZED_TABLEGEN=ON" \
3844
" -DLLVM_ENABLE_ASSERTIONS=ON" \
45+
" -DLLVM_INCLUDE_TESTS=OFF" \
46+
" -DLLVM_ENABLE_Z3_SOLVER=OFF" \
3947
"#{' -DPYTHON_EXECUTABLE=$(which python2.7)' if centos? }"\
4048
" #{project_dir}", env: env, cwd: llvm_build_dir
4149
command "cmake --build .", env: env, cwd: llvm_build_dir

omnibus/config/software/llvm_bin.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name "llvm_bin"
2-
LLVM_VERSION = (ENV['LLVM_VERSION'] || "6.0.1").strip
2+
LLVM_VERSION = (ENV['LLVM_VERSION'] || "10.0.0").strip
33
default_version "#{LLVM_VERSION}-1"
44

55
if linux?
@@ -19,6 +19,8 @@
1919
source_md5 = "9fb52b6a648e700f431b459586eb5403"
2020
when "6.0.1"
2121
source_md5 = "435beaff5e309921f4d87c275cad4e03"
22+
when "10.0.0"
23+
source_md5 = "edccfa777cba6e160b19bd5b57b12c8f"
2224
else
2325
raise "llvm_bin #{LLVM_VERSION} not supported on osx"
2426
end

0 commit comments

Comments
 (0)