Skip to content

Commit

Permalink
nanopolish: fix macOS build: pass environment's $CXXFLAGS to make (#2…
Browse files Browse the repository at this point in the history
…1330)

Fast5 uses static_assert, which is from C++11 -- which is later than
the default language standard on conda's macOS compiler. Explicitly
pass $CXXFLAGS down, as it includes `-std=c++14` and so makes
static_assert available.
  • Loading branch information
jmarshall authored Apr 6, 2020
1 parent acbeb5b commit b267f4c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
4 changes: 2 additions & 2 deletions recipes/nanopolish/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ mkdir -p $PREFIX/bin

# Linker options aren't passed to minimap2
pushd minimap2
make CFLAGS="$CFLAGS" LIBS="-L$PREFIX/lib -lm -lz -pthread" libminimap2.a
make CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LIBS="-L$PREFIX/lib -lm -lz -pthread" libminimap2.a
popd

make HDF5=noinstall EIGEN=noinstall HTS=noinstall MINIMAP=noinstall CXXFLAGS="-Iminimap2 -g -O3" LDFLAGS="$LDFLAGS -pthread -fopenmp"
make HDF5=noinstall EIGEN=noinstall HTS=noinstall MINIMAP=noinstall CXXFLAGS="$CXXFLAGS -Iminimap2 -g -O3" LDFLAGS="$LDFLAGS -pthread -fopenmp"
cp nanopolish $PREFIX/bin
cp scripts/nanopolish_makerange.py $PREFIX/bin
cp scripts/nanopolish_merge.py $PREFIX/bin
Expand Down
3 changes: 1 addition & 2 deletions recipes/nanopolish/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ package:
version: {{ version }}

build:
number: 0
skip: True # [osx]
number: 1
binary_relocation: False

source:
Expand Down

0 comments on commit b267f4c

Please sign in to comment.