Skip to content

Commit

Permalink
Add updates for 7.1 too
Browse files Browse the repository at this point in the history
  • Loading branch information
stuartarchibald committed May 9, 2019
1 parent e665a85 commit a1edfb3
Showing 1 changed file with 20 additions and 5 deletions.
25 changes: 20 additions & 5 deletions conda-recipes/llvmdev/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,22 @@
{% if ppc64le %}

# ppc64le has numerous problems in LLVM 8, so use 7.1
{% set shortversion = "7.1" %}
{% set version = "7.1.0" %}
{% set sha256_llvm = "1bcc9b285074ded87b88faaedddb88e6b5d6c331dfcfb57d7f3393dd622b3764" %}
{% set sha256_lld = "a10f274a0a09408eaf9c088dec6fb2254f7d641221437763c94546cbfe595867" %}
{% set build_number = "0" %}

{% else %}

{% set shortversion = "8.0" %}
{% set version = "8.0.0" %}
{% set sha256_llvm = "8872be1b12c61450cacc82b3d153eab02be2546ef34fa3580ed14137bb26224c" %}
{% set sha256_lld = "9caec8ec922e32ffa130f0fb08e4c5a242d7e68ce757631e425e9eba2e1a6e37" %}
{% set build_number = "0" %}

{% endif %}

package:
name: llvmdev
version: {{ version }}
Expand All @@ -21,10 +34,12 @@ source:
# https://reviews.llvm.org/D53035
# (the first, as mentioned in the patch itself, was:
# https://reviews.llvm.org/D47188)
- ../D47188-svml-VF.patch
# the patch in HEAD only applies on llvm 8
- ../D47188-svml-VF.patch # [shortversion == 8.0]
# undefined behavior bug due to Twine usage, this is fixed in llvm 8
- ../twine_cfg_undefined_behavior.patch # [shortversion == 7.1]
# Reverts a patch limiting non-GlobalValue name length
- ../0001-Revert-Limit-size-of-non-GlobalValue-name.patch

- url: http://llvm.org/releases/{{ version }}/lld-{{ version }}.src.tar.xz
fn: lld-{{ version }}.src.tar.xz
sha256: {{ sha256_lld }}
Expand Down Expand Up @@ -83,9 +98,9 @@ test:
- test -f $PREFIX/lib/libLLVMSupport.a # [unix]

- test -f $PREFIX/lib/libLLVMCore.a # [not win]
# Test for Twine bug
- $PREFIX/bin/opt -dot-cfg cfg_test.ll -o cfg.testme.tmp # [not win]
- python test_cfg_dot.py # [not win]
# Test for Twine bug, only do this for llvm 8 as the output name changed
- $PREFIX/bin/opt -dot-cfg cfg_test.ll -o cfg.testme.tmp # [not (win or shortversion == 7.1)]
- python test_cfg_dot.py # [not (win or shortversion == 7.1)]

# LLD tests
- ld.lld --version # [unix]
Expand Down

0 comments on commit a1edfb3

Please sign in to comment.