move gcc_linux install to conda_build

egluckthaler · Dec 18, 2023 · c97967f · c97967f
1 parent fa76f06
commit c97967f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/.github/workflows/conda_build.yml b/.github/workflows/conda_build.yml
@@ -28,7 +28,7 @@ jobs:
       run: |
         conda config --add channels bioconda
         conda config --add channels conda-forge
-        conda install conda-build conda-verify
+        conda install -c conda-forge conda-build conda-verify gcc_linux-64
         conda build .
       # This step installs conda-build and then uses it to build your Conda package.
 

diff --git a/build.sh b/build.sh
@@ -1,10 +1,3 @@
-# Install g++ compiler
-conda install -c conda-forge gcc_linux-64 --force-reinstall
-
-# Set environment variables to use the Conda environment's compilers
-export CC=$CONDA_PREFIX/bin/x86_64-conda-linux-gnu-gcc
-export CXX=$CONDA_PREFIX/bin/x86_64-conda-linux-gnu-g++
-
 # compile CNEFinder
 cd $SRC_DIR/CNEFinder/
 ./pre-install.sh

diff --git a/meta.yaml b/meta.yaml
@@ -15,11 +15,11 @@ build:
 requirements:
   build:
     - python=3.8.*
-    - gcc_linux-64
+    - conda-forge::gcc_linux-64
     - make
   run:
     - python=3.8.*  # Add your runtime dependencies here
-    - gcc_linux-64
+    - conda-forge::gcc_linux-64
     - mummer4=4.0.0
     - bedtools=2.30.0
     - sourmash>=4.6