Skip to content

Commit 8f2a4db

Browse files
committed
remove MKLROOT
1 parent 523692e commit 8f2a4db

4 files changed

Lines changed: 1 addition & 6 deletions

File tree

conda-recipe-cf/bld.bat

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@rem Remember to activate Intel Compiler, or remove these two lines to use Microsoft Visual Studio compiler
22

3-
set MKLROOT=%PREFIX%
43
%PYTHON% setup.py build --force install --old-and-unmanageable
54
if errorlevel 1 exit 1

conda-recipe-cf/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/bash -x
2-
MKLROOT=$PREFIX $PYTHON setup.py build --force install --old-and-unmanageable
2+
$PYTHON setup.py build --force install --old-and-unmanageable

conda-recipe/bld.bat

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ echo on
22
rem set CFLAGS=-I%PREFIX%\Library\include %CFLAGS%
33
rem set LDFLAGS=/LIBPATH:%PREFIX% %LDFLAGS%
44

5-
set MKLROOT=%CONDA_PREFIX%
6-
75
"%PYTHON%" setup.py clean --all
86

97
:: Make CMake verbose

conda-recipe/build.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#!/bin/bash
22
set -ex
33

4-
export MKLROOT=$CONDA_PREFIX
5-
64
read -r GLIBC_MAJOR GLIBC_MINOR <<<"$(conda list '^sysroot_linux-64$' \
75
| tail -n 1 | awk '{print $2}' | grep -oP '\d+' | head -n 2 | tr '\n' ' ')"
86

0 commit comments

Comments
 (0)