summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2015-11-03 09:46:30 +0000
committerBaserock Gerrit <gerrit@baserock.org>2015-11-19 14:51:01 +0000
commit3feab8a7e42b3fa4a006c101108df1d8b318f66e (patch)
tree336e099c1e076135717af4e6a1ad28b3db6ce093
parent96529a43b10b232e8ca5ea5ba4ecac88f90461a3 (diff)
downloaddefinitions-3feab8a7e42b3fa4a006c101108df1d8b318f66e.tar.gz
Upgrade llvm to 3.7
Change-Id: Iebecdff24852a8dda2e2d90871f57da839a11ed4
-rw-r--r--strata/llvm-common.morph4
-rw-r--r--strata/llvm-common/llvm.morph12
2 files changed, 10 insertions, 6 deletions
diff --git a/strata/llvm-common.morph b/strata/llvm-common.morph
index 794a7fc5..b12f4307 100644
--- a/strata/llvm-common.morph
+++ b/strata/llvm-common.morph
@@ -6,5 +6,5 @@ chunks:
- name: llvm
morph: strata/llvm-common/llvm.morph
repo: upstream:llvm
- ref: 19ade095e8c3ea61f84b71074433309f0c7c7b3b
- unpetrify-ref: release_36
+ ref: 0776facd2ee120ca6286cb2109356e05e4085bfc
+ unpetrify-ref: release_37
diff --git a/strata/llvm-common/llvm.morph b/strata/llvm-common/llvm.morph
index de274476..0d4f07c4 100644
--- a/strata/llvm-common/llvm.morph
+++ b/strata/llvm-common/llvm.morph
@@ -1,7 +1,11 @@
name: llvm
-kind: chunk
description: Low Level Virtual Machine
-build-system: autotools
+kind: chunk
+build-system: cmake
configure-commands:
-- ./configure --prefix="$PREFIX" --sysconfdir=/etc --enable-shared --enable-targets=host
- --enable-optimized --disable-assertions
+- mkdir o
+- cd o && cmake -DCMAKE_INSTALL_PREFIX="$PREFIX" -DCMAKE_BUILD_TYPE=Release ..
+build-commands:
+- cd o && make
+install-commands:
+- cd o && make DESTDIR="$DESTDIR" install