Skip to content

Commit

Permalink
Merge pull request #33 from rluria14/master
Browse files Browse the repository at this point in the history
update bazel to v2.0.0
  • Loading branch information
jjhelmus authored Feb 6, 2020
2 parents 63f8660 + bb2eb11 commit 46e74d7
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 145 deletions.
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-osx.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .ci_support/linux_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ cxx_compiler_version:
- '7'
docker_image:
- condaforge/linux-anvil-comp7

2 changes: 1 addition & 1 deletion .ci_support/osx_.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.12'
c_compiler:
- clang
c_compiler_version:
Expand Down
23 changes: 20 additions & 3 deletions recipe/build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,23 @@
#!/bin/bash

set -v -x
./compile.sh
mkdir -p $PREFIX/bin/
cp output/bazel $PREFIX/bin/

if [ $(uname) == Darwin ]; then
if [[ $(basename $CONDA_BUILD_SYSROOT) != "MacOSX10.12.sdk" ]]; then
echo "WARNING: You asked me to use $CONDA_BUILD_SYSROOT as the MacOS SDK"
echo " But because of the use of Objective-C Generics we need at"
echo " least MacOSX10.12.sdk"
CONDA_BUILD_SYSROOT=/opt/MacOSX10.12.sdk
if [[ ! -d $CONDA_BUILD_SYSROOT ]]; then
echo "ERROR: $CONDA_BUILD_SYSROOT is not a directory"
exit 1
fi
fi
./compile.sh
mkdir -p $PREFIX/bin/
mv output/bazel $PREFIX/bin
else
./compile.sh
mkdir -p $PREFIX/bin/
mv output/bazel $PREFIX/bin
fi
2 changes: 2 additions & 0 deletions recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
MACOSX_DEPLOYMENT_TARGET: # [osx]
- '10.12' # [osx]
12 changes: 0 additions & 12 deletions recipe/fix_path.patch

This file was deleted.

13 changes: 5 additions & 8 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
{% set version = "0.21.0" %}
{% set version = "2.0.0" %}

package:
name: bazel
version: {{ version }}

source:
url: https://github.com/bazelbuild/bazel/releases/download/{{ version }}/bazel-{{ version }}-dist.zip
sha256: 6ccb831e683179e0cfb351cb11ea297b4db48f9eab987601c038aa0f83037db4
patches:
- xcode_locator.patch # [osx]
- fix_path.patch # [linux]
sha256: 724da3c656f68e787a86ebb9844773aa1c2e3a873cc39462a8f1b336153d6cbb

build:
number: 0
Expand All @@ -21,9 +18,9 @@ requirements:
build:
- {{ compiler('c') }}
- {{ compiler('cxx') }}
- openjdk >=8,<11
- unzip # [linux]
- zip # [linux]
- openjdk >=8
- unzip
- zip
run:
- openjdk >=8

Expand Down
120 changes: 0 additions & 120 deletions recipe/xcode_locator.patch

This file was deleted.

0 comments on commit 46e74d7

Please sign in to comment.