Skip to content

Commit

Permalink
keep @Chost@ in activation scripts
Browse files Browse the repository at this point in the history
sed-replace directly with ${CHOST_BASE}${CL_VERSION} install-pkg.sh
  • Loading branch information
h-vetinari committed Apr 10, 2023
1 parent 0fcfdf5 commit 73a76e5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
11 changes: 5 additions & 6 deletions recipe/activate-clang_win-64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -102,26 +102,25 @@ else
LIB_USED="${CONDA_PREFIX}/lib"
fi

CHOST=@CHOST_BASE@@CL_VERSION@
WINSDK_INCLUDE=${CONDA_BUILD_WINSDK}/winsdk-@WINSDK_VERSION@/include
WINSDK_LIB=${CONDA_BUILD_WINSDK}/winsdk-@WINSDK_VERSION@/lib
MSVC_INCLUDE=${CONDA_BUILD_WINSDK}/msvc-@MSVC_HEADERS_VERSION@/include
MSVC_LIB=${CONDA_BUILD_WINSDK}/msvc-@MSVC_HEADERS_VERSION@/lib
INCLUDE_USED="${INCLUDE_USED};${MSVC_INCLUDE};${WINSDK_INCLUDE}/ucrt;${WINSDK_INCLUDE}/shared;${WINSDK_INCLUDE}/um;${WINSDK_INCLUDE}/winrt"
LIB_USED="${LIB_USED};${WINSDK_LIB}/ucrt/x64;${WINSDK_LIB}/um/x64;${MSVC_LIB}/x64"
CPPFLAGS_USED="-D_CRT_SECURE_NO_WARNINGS -D_MT -D_DLL --target=$CHOST -nostdlib -Xclang --dependent-lib=msvcrt -fuse-ld=lld -fno-aligned-allocation"
CPPFLAGS_USED="-D_CRT_SECURE_NO_WARNINGS -D_MT -D_DLL --target=@CHOST@ -nostdlib -Xclang --dependent-lib=msvcrt -fuse-ld=lld -fno-aligned-allocation"
# Only include overlay if there is one. We don't need it on case-insensitive file systems.
if [ -f "${CONDA_BUILD_WINSDK}/winsdk-@WINSDK_VERSION@/winsdk_vfs_overlay.yaml" ]; then
CPPFLAGS_USED="${CPPFLAGS_USED} -Xclang -ivfsoverlay -Xclang ${CONDA_BUILD_WINSDK}/winsdk-@WINSDK_VERSION@/winsdk_vfs_overlay.yaml"
fi
LDFLAGS_USED="--target=$CHOST -nostdlib -Xclang --dependent-lib=msvcrt -fuse-ld=lld"
LDFLAGS_USED="--target=@CHOST@ -nostdlib -Xclang --dependent-lib=msvcrt -fuse-ld=lld"
LDFLAGS_USED="${LDFLAGS_USED} -Wl,-defaultlib:@PREFIX@/lib/clang/@PKG_VERSION@/lib/windows/clang_rt.builtins-x86_64.lib"

_tc_activation \
activate host $CHOST $CHOST- \
activate host @CHOST@ @CHOST@- \
as clang clang++ \
"CC,${CC:-$CHOST-clang}" \
"CXX,${CXX:-$CHOST-clang++}" \
"CC,${CC:-@CHOST@-clang}" \
"CXX,${CXX:-@CHOST@-clang++}" \
"LD,${LD-$(which lld-link)}" \
"AR,${AR-$(which llvm-ar)}" \
"RANLIB,${RANLIB-$(which llvm-ranlib)}" \
Expand Down
5 changes: 1 addition & 4 deletions recipe/install-pkg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ do
cp "${RECIPE_DIR}/${CHANGE}-${PKG_NAME}.sh" .
sed -i.bak "s|@CFLAGS@|$FINAL_CFLAGS|g" ${CHANGE}-${PKG_NAME}.sh
sed -i.bak "s|@CXXFLAGS@|$FINAL_CXXFLAGS|g" ${CHANGE}-${PKG_NAME}.sh
sed -i.bak "s|@CHOST_BASE@|$CHOST_BASE|g" ${CHANGE}-${PKG_NAME}.sh
sed -i.bak "s|@CL_VERSION@|$CL_VERSION|g" ${CHANGE}-${PKG_NAME}.sh
sed -i.bak "s|@CHOST@|${CHOST_BASE}${CL_VERSION}|g" ${CHANGE}-${PKG_NAME}.sh
sed -i.bak "s|@PREFIX@|$PREFIX|g" ${CHANGE}-${PKG_NAME}.sh
sed -i.bak "s|@PKG_VERSION@|$PKG_VERSION|g" ${CHANGE}-${PKG_NAME}.sh
sed -i.bak "s|@MSVC_HEADERS_VERSION@|$MSVC_HEADERS_VERSION|g" ${CHANGE}-${PKG_NAME}.sh
Expand All @@ -61,8 +60,6 @@ do
cp ${CHANGE}-${PKG_NAME}.sh ${PREFIX}/etc/conda/${CHANGE}.d/${CHANGE}-${PKG_NAME}.sh
done

CHOST=$CHOST_BASE$CL_VERSION

if [[ "$PKG_NAME" == "clang_win-64" ]]; then
mkdir -p $PREFIX/bin
pushd ${PREFIX}/bin
Expand Down

0 comments on commit 73a76e5

Please sign in to comment.