Merge branch 'rec' of github.com:scopatz/pyne-ci into rec

pyne · Mar 9, 2015 · f153c5a · f153c5a
2 parents 5047e4b + f41e4fe
commit f153c5a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/conda_test.sh b/conda_test.sh
@@ -3,7 +3,7 @@ set -x
 set -e
 source conda_env.sh
 
-tar_dir="pyne-unichr"
+tar_dir="pyne-ci"
 
 # Setup workdir
 if [ -d "${BLD}/work/${tar_dir}" ]; then

diff --git a/pyne/build.sh b/pyne/build.sh
@@ -14,6 +14,8 @@ if [[ "${UNAME}" == 'Linux' ]]; then
 else
   ln -s $PREFIX/lib/libhdf5.9.dylib $PREFIX/lib/libhdf5.8.dylib
   ln -s $PREFIX/lib/libhdf5_hl.9.dylib $PREFIX/lib/libhdf5_hl.8.dylib
+  export CC=gcc
+  export CXX=g++
 fi
 
 ${PYTHON} setup.py install
@@ -27,4 +29,4 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
 elif [[ "$OSTYPE" == "linux-gnu" ]]; then
   find . -name '*.so' | xargs chmod +x
   cp build/src/*.so $PREFIX/lib
-fi
+fi
diff --git a/pyne/meta.yaml b/pyne/meta.yaml
@@ -11,6 +11,7 @@ source:
 requirements:
   build:
     - python
+    - gcc  # [osx]
     - cmake
     - cython
     - moab