Skip to content

Commit bc91f3a

Browse files
committed
fix stddef.h path
1 parent 8ed61eb commit bc91f3a

3 files changed

Lines changed: 13 additions & 9 deletions

File tree

.github/workflows/conda.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
deb http://archive.debian.org/debian-security buster/updates main contrib non-free
6363
EOF
6464
apt-get update
65-
apt-get install -y git make libclang-dev
65+
apt-get install -y git make
6666
- name: Set up Miniconda
6767
uses: conda-incubator/setup-miniconda@v3
6868
with:
@@ -105,7 +105,7 @@ jobs:
105105
deb http://archive.debian.org/debian-security buster/updates main contrib non-free
106106
EOF
107107
apt-get update
108-
apt-get install -y git make libclang-dev
108+
apt-get install -y git make
109109
- name: Set up Miniconda
110110
uses: conda-incubator/setup-miniconda@v3
111111
with:

recipe/meta.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ source:
4040
folder: rest_regression
4141

4242
build:
43-
number: 4
43+
number: 5
4444
# Uncomment the following line if the package is pure Python and the recipe is exactly the same for all platforms.
4545
# It is okay if the dependencies are not built for all platforms/versions, although selectors are still not allowed.
4646
# See https://conda-forge.org/docs/maintainer/knowledge_base.html#noarch-python for more details.
@@ -67,10 +67,11 @@ build:
6767
export REST_FORTRAN_COMPILER=$F90
6868
echo RESTFORT${REST_FORTRAN_COMPILER}
6969
export LIBCLANG_PATH="$BUILD_PREFIX/lib"
70-
export CFLAGS="--sysroot=${CONDA_BUILD_SYSROOT} -I${CONDA_BUILD_SYSROOT}/usr/include"
71-
export CXXFLAGS="--sysroot=${CONDA_BUILD_SYSROOT} -I${CONDA_BUILD_SYSROOT}/usr/include"
70+
export GCC_INCLUDE="${BUILD_PREFIX}/lib/gcc/*/*/include/"
71+
export CFLAGS="--sysroot=${CONDA_BUILD_SYSROOT} -I${GCC_INCLUDE} -I${CONDA_BUILD_SYSROOT}/usr/include"
72+
export CXXFLAGS="--sysroot=${CONDA_BUILD_SYSROOT} -I${GCC_INCLUDE} -I${CONDA_BUILD_SYSROOT}/usr/include"
7273
export RUSTFLAGS="-C link-args=--sysroot=${CONDA_BUILD_SYSROOT}"
73-
export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=$CONDA_BUILD_SYSROOT -I${CONDA_BUILD_SYSROOT}/usr/include"
74+
export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=$CONDA_BUILD_SYSROOT -I${GCC_INCLUDE} -I${CONDA_BUILD_SYSROOT}/usr/include"
7475
# cargo build --release --verbose --target=x86_64-unknown-linux-gnu
7576
cargo install --path . --profile release --root ${PREFIX}
7677
mkdir -p ${PREFIX}/share/rest/

recipe_oldkern/meta.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,12 @@ build:
6666
# export REST_HOME=".."
6767
export REST_FORTRAN_COMPILER=$F90
6868
echo RESTFORT${REST_FORTRAN_COMPILER}
69-
export CFLAGS="--sysroot=${CONDA_BUILD_SYSROOT}"
70-
export CXXFLAGS="--sysroot=${CONDA_BUILD_SYSROOT}"
69+
export LIBCLANG_PATH="$BUILD_PREFIX/lib"
70+
export GCC_INCLUDE="${BUILD_PREFIX}/lib/gcc/*/*/include/"
71+
export CFLAGS="--sysroot=${CONDA_BUILD_SYSROOT} -I${GCC_INCLUDE} -I${CONDA_BUILD_SYSROOT}/usr/include"
72+
export CXXFLAGS="--sysroot=${CONDA_BUILD_SYSROOT} -I${GCC_INCLUDE} -I${CONDA_BUILD_SYSROOT}/usr/include"
7173
export RUSTFLAGS="-C link-args=--sysroot=${CONDA_BUILD_SYSROOT}"
72-
export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=$CONDA_BUILD_SYSROOT"
74+
export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=$CONDA_BUILD_SYSROOT -I${GCC_INCLUDE} -I${CONDA_BUILD_SYSROOT}/usr/include"
7375
# cargo build --release --verbose --target=x86_64-unknown-linux-gnu
7476
cargo install --path . --profile release --root ${PREFIX}
7577
mkdir -p ${PREFIX}/share/rest/
@@ -89,6 +91,7 @@ requirements:
8991
# this is necessary for all compiled recipes
9092
# - {{ stdlib('c') }}
9193
- {{ compiler('rust') }}
94+
- libclang
9295
- hdf5
9396
- libcint
9497
- openblas * openmp*

0 commit comments

Comments
 (0)