Skip to content

Commit 8f79259

Browse files
committed
libressl needs ASM settings now
1 parent c88ce98 commit 8f79259

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

_build.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -790,6 +790,7 @@ build_single_target() {
790790
export _LDFLAGS_CXX_GLOBAL='' # CMake uses this
791791
export _CMAKE_GLOBAL='-Wno-dev' # Suppress CMake warnings meant for upstream developers
792792
export _CMAKE_CXX_GLOBAL=''
793+
export _CMAKE_ASM_GLOBAL=''
793794
export _CROSS=0
794795

795796
if [[ "${_CONFIG}" =~ (small|zero) ]]; then
@@ -1281,6 +1282,7 @@ build_single_target() {
12811282

12821283
_CMAKE_GLOBAL+=" -DCMAKE_C_COMPILER_TARGET=${_TRIPLET}"
12831284
_CMAKE_CXX_GLOBAL+=" -DCMAKE_CXX_COMPILER_TARGET=${_TRIPLET}"
1285+
_CMAKE_ASM_GLOBAL+=" -DCMAKE_ASM_COMPILER_TARGET=${_TRIPLET}"
12841286

12851287
# Needed to exclude compiler info from objects, but for our Windows COFF
12861288
# outputs this seems to be a no-op as of llvm/clang 13.x/14.x.

libressl.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,12 @@ _VER="$1"
7171
fi
7272

7373
# shellcheck disable=SC2086
74-
cmake -B "${_BLDDIR}" ${_CMAKE_GLOBAL} ${options} \
74+
cmake -B "${_BLDDIR}" ${_CMAKE_GLOBAL} ${_CMAKE_ASM_GLOBAL} ${options} \
7575
'-DBUILD_SHARED_LIBS=OFF' \
7676
'-DLIBRESSL_APPS=OFF' \
7777
'-DLIBRESSL_TESTS=OFF' \
78-
"-DCMAKE_C_FLAGS=${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${CFLAGS} ${CPPFLAGS} ${_LDFLAGS_GLOBAL}"
78+
"-DCMAKE_C_FLAGS=${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${CFLAGS} ${CPPFLAGS} ${_LDFLAGS_GLOBAL}" \
79+
"-DCMAKE_ASM_FLAGS=${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${CFLAGS} ${CPPFLAGS} ${_LDFLAGS_GLOBAL}"
7980

8081
make --directory="${_BLDDIR}" --jobs="${_JOBS}" install "DESTDIR=$(pwd)/${_PKGDIR}"
8182

0 commit comments

Comments
 (0)