Skip to content

Commit

Permalink
take care of compiler-rt path for rc releases
Browse files Browse the repository at this point in the history
  • Loading branch information
h-vetinari committed Jul 31, 2023
1 parent c6d45d8 commit f1fd197
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
7 changes: 7 additions & 0 deletions recipe/install-pkg.bat
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
@echo on
md "%PREFIX%\etc\conda\activate.d"

:: strip off ".rcX" suffixes, which are not part of the installation path
set PKG_VERSION=%PKG_VERSION:.rc1=%
set PKG_VERSION=%PKG_VERSION:.rc2=%
set PKG_VERSION=%PKG_VERSION:.rc3=%
set PKG_VERSION=%PKG_VERSION:.rc4=%
set PKG_VERSION=%PKG_VERSION:.rc5=%

rem We need the additional z in the activation name to have the activation call
rem run after the vs2017 activation. See https://github.com/conda/conda/pull/7176
rem for conda's ordering implementation.
Expand Down
5 changes: 5 additions & 0 deletions recipe/install-pkg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ fi
echo CHOST_BASE=$CHOST_BASE
echo CL_VERSION=$CL_VERSION

# cut off ".rcX" from PKG_VERSION; suffix is not present in installation path
if [[ "${PKG_VERSION}" == *rc* ]]; then
export PKG_VERSION=${PKG_VERSION::${#PKG_VERSION}-4}
fi

for CHANGE in "activate" "deactivate"
do
mkdir -p "${PREFIX}/etc/conda/${CHANGE}.d"
Expand Down

0 comments on commit f1fd197

Please sign in to comment.