diff options
| author | Matt Rendina <rendinam@users.noreply.github.com> | 2020-01-17 16:56:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-17 16:56:20 -0500 |
| commit | a4ad76f33c2493ac5a50bac604587a47be763dae (patch) | |
| tree | a2ad42b216e57828b9791dec390a9677a0cc3255 /hstcal | |
| parent | faf3edad5f9d07750f08195b21e865c9ea3e01ad (diff) | |
| download | astroconda-contrib-a4ad76f33c2493ac5a50bac604587a47be763dae.tar.gz | |
Update recipe to use operational toolchains (#596)
Conda-supplied compilers used for linux.
OS-provided compilers are used for Macos.
Diffstat (limited to 'hstcal')
| -rw-r--r-- | hstcal/build.sh | 9 | ||||
| -rw-r--r-- | hstcal/meta.yaml | 5 |
2 files changed, 12 insertions, 2 deletions
diff --git a/hstcal/build.sh b/hstcal/build.sh index a9727f0..743a75f 100644 --- a/hstcal/build.sh +++ b/hstcal/build.sh @@ -1,5 +1,12 @@ +# Use the compilers provided by conda. The activation of the build +# environment defines the GCC and GFORTRAN env vars. +export CC=$CC + +export FCFLAGS="$FCFLAGS -fPIC" + if [[ `uname` == Darwin ]]; then - export CC=`which gcc` + export CC=$(which $CLANG) + export GFORTRAN=$(which gfortran) if [[ `uname -m` == x86_64 ]]; then export CFLAGS="$CFLAGS -m64" export LDFLAGS="$LDFLAGS -m64" diff --git a/hstcal/meta.yaml b/hstcal/meta.yaml index b43f9ab..53e4767 100644 --- a/hstcal/meta.yaml +++ b/hstcal/meta.yaml @@ -18,7 +18,10 @@ requirements: build: - cfitsio >=3.440 - pkg-config - - gcc >=4.7 + - gcc_linux-64 [linux] + - gfortran_linux-64 [linux] + # OS-provided compilers and macos SDK used. + # The conda toolchains do not work on macos. run: - cfitsio |