Skip to content

Commit

Permalink
libressl needs ASM settings now
Browse files Browse the repository at this point in the history
  • Loading branch information
vszakats committed Oct 16, 2024
1 parent c88ce98 commit 8f79259
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 2 additions & 0 deletions _build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -790,6 +790,7 @@ build_single_target() {
export _LDFLAGS_CXX_GLOBAL='' # CMake uses this
export _CMAKE_GLOBAL='-Wno-dev' # Suppress CMake warnings meant for upstream developers
export _CMAKE_CXX_GLOBAL=''
export _CMAKE_ASM_GLOBAL=''
export _CROSS=0

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

_CMAKE_GLOBAL+=" -DCMAKE_C_COMPILER_TARGET=${_TRIPLET}"
_CMAKE_CXX_GLOBAL+=" -DCMAKE_CXX_COMPILER_TARGET=${_TRIPLET}"
_CMAKE_ASM_GLOBAL+=" -DCMAKE_ASM_COMPILER_TARGET=${_TRIPLET}"

# Needed to exclude compiler info from objects, but for our Windows COFF
# outputs this seems to be a no-op as of llvm/clang 13.x/14.x.
Expand Down
5 changes: 3 additions & 2 deletions libressl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,12 @@ _VER="$1"
fi

# shellcheck disable=SC2086
cmake -B "${_BLDDIR}" ${_CMAKE_GLOBAL} ${options} \
cmake -B "${_BLDDIR}" ${_CMAKE_GLOBAL} ${_CMAKE_ASM_GLOBAL} ${options} \
'-DBUILD_SHARED_LIBS=OFF' \
'-DLIBRESSL_APPS=OFF' \
'-DLIBRESSL_TESTS=OFF' \
"-DCMAKE_C_FLAGS=${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${CFLAGS} ${CPPFLAGS} ${_LDFLAGS_GLOBAL}"
"-DCMAKE_C_FLAGS=${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${CFLAGS} ${CPPFLAGS} ${_LDFLAGS_GLOBAL}" \
"-DCMAKE_ASM_FLAGS=${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${CFLAGS} ${CPPFLAGS} ${_LDFLAGS_GLOBAL}"

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

Expand Down

0 comments on commit 8f79259

Please sign in to comment.