Skip to content

Commit 97e7dc6

Browse files
pkawakdssimmons
authored andcommitted
attempt to fix build-conda error on GitHub actions pt4
1 parent ce7a435 commit 97e7dc6

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,12 @@ conda: $(ENV_STAMP)
292292
MAKE_CXX=""; MAKE_CC=""; \
293293
fi; \
294294
echo ">> Using $$MAKE_CC $$MAKE_CXX"; \
295-
$(MAKE) $$MAKE_CC $$MAKE_CXX MODE=$(MODE) OMP=$(OMP) \
295+
export CPATH="$$CONDA_PREFIX/include:$${CPATH:-}"; \
296+
export LIBRARY_PATH="$$CONDA_PREFIX/lib:$${LIBRARY_PATH:-}"; \
297+
echo ">> pkg-config: $(which pkg-config || true)" \
298+
echo ">> fftw cflags: $$(pkg-config --cflags fftw3 || true)" \
299+
echo ">> fftw libs: $$(pkg-config --libs fftw3 || true)" \
300+
$(MAKE) $$MAKE_CC $$MAKE_CXX MODE=$(MODE) OMP=$(OMP) FFTW_ROOT="$$CONDA_PREFIX" \
296301
'
297302

298303
# Optional: interactive shell in the env (handy for debugging)

0 commit comments

Comments
 (0)