diff --git a/conda_recipe/xspec-modelsonly-linux/build.sh b/conda_recipe/xspec-modelsonly-linux/build.sh index e31a3d9..e73057c 100644 --- a/conda_recipe/xspec-modelsonly-linux/build.sh +++ b/conda_recipe/xspec-modelsonly-linux/build.sh @@ -3,6 +3,9 @@ echo $PWD echo $RECIPE_DIR echo $CC echo $CXX +echo $CONDA_PREFIX +echo $BUILD_PREFIX + tar xf heasoft-6.30.1src.tar.gz @@ -37,7 +40,8 @@ cd ${XSPEC_MODELS_ONLY}/BUILD_DIR export CFLAGS="-I$CONDA_PREFIX/include" export CXXFLAGS="-std=c++11 -Wno-c++11-narrowing -Wall -Wno-deprecated -I$CONDA_PREFIX/include" -export LDFLAGS="$LDFLAGS -L$CONDA_PREFIX/lib -undefined dynamic_lookup --enable-shared" +#export LDFLAGS="$LDFLAGS -L$CONDA_PREFIX/lib -undefined dynamic_lookup --enable-shared" +export LDFLAGS="$LDFLAGS -L$CONDA_PREFIX/lib " # -L${PREFIX}/lib" export CCTEST="echo" diff --git a/conda_recipe/xspec-modelsonly-linux/meta.yaml b/conda_recipe/xspec-modelsonly-linux/meta.yaml index 6d639b2..61c8897 100644 --- a/conda_recipe/xspec-modelsonly-linux/meta.yaml +++ b/conda_recipe/xspec-modelsonly-linux/meta.yaml @@ -10,9 +10,8 @@ build: requirements: build: - - gfortran_osx-64 # [osx] - - {{ compiler('c') }} # [osx] - - {{ compiler('cxx') }} # [osx] + - {{ compiler('c') }} + - {{ compiler('cxx') }} - {{ compiler('fortran') }} # [linux] #- libgfortran>=3.0,<4.0 # [osx] #- libgfortran-ng==7.5.0 # [linux] diff --git a/conda_recipe/xspec-modelsonly/conda_build_config.yaml b/conda_recipe/xspec-modelsonly/conda_build_config.yaml index bfeb2f3..341b44b 100644 --- a/conda_recipe/xspec-modelsonly/conda_build_config.yaml +++ b/conda_recipe/xspec-modelsonly/conda_build_config.yaml @@ -1,8 +1,8 @@ -# c_compiler: -# - gcc # [linux] -# - clang # [osx] -# cxx_compiler: -# - gxx # [linux] -# - clangxx # [osx] -# CONDA_BUILD_SYSROOT: -# - /opt/MacOSX10.10.sdk # [osx] +c_compiler: + - gcc # [linux] + - clang # [osx] +cxx_compiler: + - gxx # [linux] + - clangxx # [osx] +CONDA_BUILD_SYSROOT: + - /opt/MacOSX10.10.sdk # [osx]