Skip to content

Commit

Permalink
More fixes, I hope
Browse files Browse the repository at this point in the history
  • Loading branch information
bryanwweber committed Jun 25, 2024
1 parent 7110251 commit 34957a9
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ jobs:
if: runner.os != 'Windows'
run: "rsync -azvP [email protected]:. ${MW_HEADERS_DIR}"
- name: Build the MATLAB recipe
run: conda build ./cantera-matlab -m ./.ci_support/conda_build_config.yaml
run: conda build --debug ./cantera-matlab -m ./.ci_support/conda_build_config.yaml
- name: List package contents
run: |
find '${{ runner.os == 'Windows' && '/c/Miniconda3' || env.CONDA }}/conda-bld' -name \*cantera\*.tar.bz2 | while read -r file; do
Expand Down
16 changes: 12 additions & 4 deletions cantera-matlab/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,31 @@ if [[ "${OSX_ARCH}" == "" ]]; then
echo "debug = False" >> cantera.conf
echo "logging = 'debug'" >> cantera.conf
else
echo "CC = '${CLANG}'" >> cantera.conf
echo "CXX = '${CLANGXX}'" >> cantera.conf
if [[ "${CONDA_BUILD_SYSROOT}" != "" ]]; then
echo "cc_flags = '-isysroot ${CONDA_BUILD_SYSROOT}'" >> cantera.conf
echo "no_debug_linker_flags = '-isysroot ${CONDA_BUILD_SYSROOT}'" >> cantera.conf
echo "cc_flags = '-isysroot ${CONDA_BUILD_SYSROOT} ${CFLAGS}'" >> cantera.conf
echo "no_debug_linker_flags = '${LDFLAGS} -isysroot ${CONDA_BUILD_SYSROOT}'" >> cantera.conf
else
echo "cc_flags = '${CFLAGS}'" >> cantera.conf
echo "no_debug_linker_flags = '${LDFLAGS}'" >> cantera.conf
fi
echo "optimize_flags = ''" >> cantera.conf
echo "debug = False" >> cantera.conf

echo "use_rpath_linkage = False" >> cantera.conf
echo "logging = 'debug'" >> cantera.conf
echo "use_rpath_linkage = False" >> cantera.conf
fi

echo "matlab_toolbox = 'y'" >> cantera.conf
echo "matlab_path = '${MW_HEADERS_DIR}'" >> cantera.conf

echo "extra_inc_dirs = '${PREFIX}/include'" >> cantera.conf
echo "extra_lib_dirs = '${PREFIX}/lib'" >> cantera.conf

set -xe

${BUILD_PREFIX}/bin/python ${BUILD_PREFIX}/bin/scons install
${BUILD_PREFIX}/bin/python `which scons` install -j${CPU_COUNT}

# "Install" just the Matlab interface. This method should
# prevent this package from clobbering any existing
Expand Down

0 comments on commit 34957a9

Please sign in to comment.