Skip to content

Commit 1718459

Browse files
committed
Drop the static builds for now
1 parent 6d0bb08 commit 1718459

File tree

2 files changed

+4
-20
lines changed

2 files changed

+4
-20
lines changed

ci-targets.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -359,9 +359,10 @@ linux:
359359
- "3.13"
360360
- "3.14"
361361
build_options:
362-
- debug+static
363-
- noopt+static
364-
- lto+static
362+
# TODO: Static support is current blocked by some compiler-rt linking issues
363+
# - debug+static
364+
# - noopt+static
365+
# - lto+static
365366
- debug
366367
- noopt
367368
- lto

cpython-unix/build-bzip2.sh

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,6 @@ else
1515
AR=ar
1616
fi
1717

18-
# Copy compiler-rt builtins library for static aarch64-musl builds
19-
if [ "${TARGET_TRIPLE}" = "aarch64-unknown-linux-musl" ] && [ "${CC}" = "musl-clang" ] && [ -n "${STATIC}" ]; then
20-
# musl-clang eliminates default library search paths, so copy compiler-rt builtins to accessible location
21-
for lib in ${TOOLS_PATH}/${TOOLCHAIN}/lib/clang/*/lib/aarch64-unknown-linux-gnu/libclang_rt.builtins.a; do
22-
if [ -e "$lib" ]; then
23-
filename=$(basename "$lib")
24-
if [ -e "${TOOLS_PATH}/host/lib/${filename}" ]; then
25-
echo "warning: ${filename} already exists"
26-
fi
27-
cp "$lib" ${TOOLS_PATH}/host/lib/
28-
fi
29-
done
30-
31-
# Add explicit library path for compiler-rt builtins
32-
export EXTRA_TARGET_LDFLAGS="${EXTRA_TARGET_LDFLAGS} -L${TOOLS_PATH}/host/lib -lclang_rt.builtins"
33-
fi
34-
3518
tar -xf bzip2-${BZIP2_VERSION}.tar.gz
3619

3720
pushd bzip2-${BZIP2_VERSION}

0 commit comments

Comments
 (0)