From e058ab98dc19208aca958ed2cb8d310c8a6ecd9f Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Tue, 8 Aug 2023 20:15:36 -0400 Subject: [PATCH] [SCons] Keep conda build environment path out of generated cantera.pc --- platform/posix/SConscript | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/platform/posix/SConscript b/platform/posix/SConscript index 0b6dcdcf0a..6ebb9885f2 100644 --- a/platform/posix/SConscript +++ b/platform/posix/SConscript @@ -18,7 +18,13 @@ pc_libdirs = [] pc_incdirs = [] pc_cflags = list(localenv['CXXFLAGS']) -if not localenv["package_build"]: +if localenv["package_build"]: + # Remove local conda build environment from the installed include list + for i in range(len(pc_cflags) - 1): + if pc_cflags[i] == '-isystem' and '/_build_env/' in pc_cflags[i+1]: + del pc_cflags[i:i+2] + break +else: pc_incdirs.extend(localenv["extra_inc_dirs"]) pc_libdirs.extend(localenv["extra_lib_dirs"])