Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit bfa622b

Browse files
committed
Improve building i386 target in a mildly horrible way
1 parent 4a29052 commit bfa622b

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

‎Dockerfile.openssl-1.1.1k

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ LDFLAGS="-L/output/lib" \
1414
-static \
1515
no-shared no-engine no-idea no-mdc2 no-rc5 no-zlib no-ssl3 no-capieng \
1616
--prefix=/output \
17+
$(if echo "$MUSL_TARGET" | grep i386 >/dev/null; then printf -- '-latomic'; fi) \
1718
$(if echo "$MUSL_TARGET" | grep 64 >/dev/null; then echo linux-generic64; else echo linux-generic32; fi) && \
1819
make -j$(nproc) && \
1920
make install_sw && \

‎Dockerfile.stunnel-5.64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN export PATH=/build/cross/bin:$PATH:/output/bin && \
1111
cd stunnel-* && \
1212
export CC="$MUSL_TARGET-gcc" && \
1313
export CFLAGS="-static -I/output/include -frandom-seed=pulse" && \
14-
export LDFLAGS="--static -L/output/lib" && \
14+
export LDFLAGS="--static -L/output/lib $(if echo "$MUSL_TARGET" | grep i386 >/dev/null; then printf -- '-l:libatomic.a'; fi)" && \
1515
./configure \
1616
--disable-shared \
1717
--disable-fips \

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /