Skip to content

Commit 40d54f7

Browse files
Fix loongarch64 environment variable (#103)
1 parent cd87b04 commit 40d54f7

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

manylinux_2_36/loongarch64/.config

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,9 @@ CT_TARGET_LDFLAGS=""
205205
CT_USE_SYSROOT=y
206206
CT_SYSROOT_NAME="sysroot"
207207
CT_SYSROOT_DIR_PREFIX=""
208+
CT_WANTS_STATIC_LINK=y
209+
CT_WANTS_STATIC_LINK_CXX=y
210+
# CT_STATIC_TOOLCHAIN is not set
208211
CT_SHOW_CT_VERSION=y
209212
CT_TOOLCHAIN_PKGVERSION=""
210213
CT_TOOLCHAIN_BUGURL=""
@@ -370,11 +373,8 @@ CT_BINUTILS_2_26_or_later=y
370373
#
371374
# GNU binutils
372375
#
373-
CT_BINUTILS_GOLD_SUPPORTS_ARCH=y
374-
CT_BINUTILS_GOLD_SUPPORT=y
375376
CT_BINUTILS_FORCE_LD_BFD_DEFAULT=y
376377
CT_BINUTILS_LINKER_LD=y
377-
# CT_BINUTILS_LINKER_LD_GOLD is not set
378378
CT_BINUTILS_LINKERS_LIST="ld"
379379
CT_BINUTILS_LINKER_DEFAULT="bfd"
380380
# CT_BINUTILS_PLUGINS is not set
@@ -472,10 +472,12 @@ CT_GLIBC_BUILD_SSP=y
472472
CT_GLIBC_HAS_LIBIDN_ADDON=y
473473
# CT_GLIBC_USE_LIBIDN_ADDON is not set
474474
CT_GLIBC_NO_SPARC_V8=y
475+
CT_GLIBC_HAS_OBSOLETE_RPC=y
475476
CT_GLIBC_EXTRA_CONFIG_ARRAY=""
476477
CT_GLIBC_CONFIGPARMS=""
477478
CT_GLIBC_ENABLE_DEBUG=y
478479
CT_GLIBC_EXTRA_CFLAGS=""
480+
CT_GLIBC_ENABLE_OBSOLETE_RPC=y
479481
# CT_GLIBC_ENABLE_FORTIFIED_BUILD is not set
480482
# CT_GLIBC_DISABLE_VERSIONING is not set
481483
CT_GLIBC_OLDEST_ABI=""
@@ -579,6 +581,7 @@ CT_CC_GCC_HAS_LIBMPX=y
579581
CT_CC_GCC_ENABLE_CXX_FLAGS=""
580582
CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY=""
581583
CT_CC_GCC_EXTRA_CONFIG_ARRAY=""
584+
CT_CC_GCC_STATIC_LIBSTDCXX=y
582585
# CT_CC_GCC_SYSTEM_ZLIB is not set
583586
CT_CC_GCC_CONFIG_TLS=m
584587

manylinux_2_36/loongarch64/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ ENV TARGET_CC=loongarch64-unknown-linux-gnu-gcc \
7878
TARGET_C_INCLUDE_PATH=/usr/loongarch64-unknown-linux-gnu/loongarch64-unknown-linux-gnu/sysroot/usr/include/
7979

8080
ENV CARGO_BUILD_TARGET=loongarch64-unknown-linux-gnu
81-
ENV CARGO_TARGET_loongarch64_UNKNOWN_LINUX_GNU_LINKER=loongarch64-unknown-linux-gnu-gcc
81+
ENV CARGO_TARGET_LOONGARCH64_UNKNOWN_LINUX_GNU_LINKER=loongarch64-unknown-linux-gnu-gcc
8282
RUN echo "set(CMAKE_SYSTEM_NAME Linux)\nset(CMAKE_SYSTEM_PROCESSOR loongarch64)\nset(CMAKE_SYSROOT /usr/loongarch64-unknown-linux-gnu/loongarch64-unknown-linux-gnu/sysroot/)\nset(CMAKE_C_COMPILER loongarch64-unknown-linux-gnu-gcc)\nset(CMAKE_CXX_COMPILER loongarch64-unknown-linux-gnu-g++)" > /usr/loongarch64-unknown-linux-gnu/cmake-toolchain.cmake
8383
ENV TARGET_CMAKE_TOOLCHAIN_FILE_PATH=/usr/loongarch64-unknown-linux-gnu/cmake-toolchain.cmake
8484

@@ -99,7 +99,7 @@ RUN echo 'Acquire::Retries "3";' > /etc/apt/apt.conf.d/80-retries && \
9999
libclang-dev \
100100
clang
101101

102-
ENV loongarch64_UNKNOWN_LINUX_GNU_OPENSSL_DIR=/usr/loongarch64-unknown-linux-gnu/
102+
ENV LOONGARCH64_UNKNOWN_LINUX_GNU_OPENSSL_DIR=/usr/loongarch64-unknown-linux-gnu/
103103
RUN add-apt-repository -y ppa:deadsnakes/ppa && \
104104
apt-get update && \
105105
apt-get install -y \

0 commit comments

Comments
 (0)