Skip to content

Commit ad7a35f

Browse files
committed
respond to review
- switch cases on `PYTHON_VARIANT` - remove `minor_version` by using `python3` - remove runtime-only asan options
1 parent 6c47ff1 commit ad7a35f

3 files changed

Lines changed: 5 additions & 9 deletions

File tree

Tools/pixi-packages/asan/recipe.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
context:
22
# XXX: keep up to date
33
version: "3.15"
4-
minor_version: "3.15"
54

65
package:
76
name: python
@@ -17,8 +16,7 @@ build:
1716
script:
1817
file: ../build.sh
1918
env:
20-
MINOR_VERSION: ${{ minor_version }}
21-
PYTHON_ASAN: "1"
19+
PYTHON_VARIANT: "asan"
2220

2321
# XXX: maybe not all requirements necessary
2422
# derived from https://github.com/conda-forge/python-feedstock/blob/main/recipe/meta.yaml

Tools/pixi-packages/build.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
#!/bin/bash
22

3-
if [[ "${PYTHON_ASAN}" == 1 ]]; then
3+
if [[ "${PYTHON_VARIANT}" == "asan" ]]; then
44
echo "BUILD TYPE: ASAN"
55
BUILD_DIR="../build_asan"
66
CONFIGURE_EXTRA="--with-address-sanitizer"
7-
export ASAN_OPTIONS="detect_leaks=0:symbolize=1:strict_init_order=true:allocator_may_return_null=1:use_sigaltstack=0"
7+
export PYTHON_ASAN="1"
8+
export ASAN_OPTIONS="strict_init_order=true"
89
else
910
echo "BUILD TYPE: DEFAULT"
1011
BUILD_DIR="../build"
@@ -28,7 +29,7 @@ fi
2829
touch configure-done
2930

3031
make -j"${CPU_COUNT}" install
31-
ln -sf "${PREFIX}/bin/python${MINOR_VERSION}" "${PREFIX}/bin/python"
32+
ln -sf "${PREFIX}/bin/python3" "${PREFIX}/bin/python"
3233

3334
# https://github.com/prefix-dev/rattler-build/issues/2012
3435
if [[ ${OSTYPE} == "darwin"* ]]; then

Tools/pixi-packages/default/recipe.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
context:
22
# XXX: keep up to date
33
version: "3.15"
4-
minor_version: "3.15"
54

65
package:
76
name: python
@@ -16,8 +15,6 @@ build:
1615
- "*.o"
1716
script:
1817
file: ../build.sh
19-
env:
20-
MINOR_VERSION: ${{ minor_version }}
2118

2219
# XXX: maybe not all requirements necessary
2320
# derived from https://github.com/conda-forge/python-feedstock/blob/main/recipe/meta.yaml

0 commit comments

Comments
 (0)