Skip to content

Commit

Permalink
boringssl.sh: revert custom CPPFLAGS that did not work
Browse files Browse the repository at this point in the history
  • Loading branch information
vszakats committed Nov 6, 2024
1 parent 04f31c3 commit 10226ec
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions boringssl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ _VER="$1"
[ "${CW_DEV_INCREMENTAL:-}" != '1' ] && rm -r -f "${_PKGDIR:?}" "${_BLDDIR:?}"

CFLAGS="-ffile-prefix-map=$(pwd)="
CPPFLAGS=''
LIBS='-lpthread' # for tests
options=''

Expand Down Expand Up @@ -108,8 +107,6 @@ _VER="$1"
options+=' -DDISABLE_GO=ON'
options+=' -DDISABLE_PERL=ON'

CPPFLAGS+=' -Wno-cast-function-type'

# Patch out to avoid redefinition errors
sed -i.bak 's/-D_WIN32_WINNT=_WIN32_WINNT_WIN7//g' ./CMakeLists.txt
else
Expand All @@ -130,8 +127,8 @@ _VER="$1"
# shellcheck disable=SC2086
cmake -B "${_BLDDIR}" ${_CMAKE_GLOBAL} ${_CMAKE_CXX_GLOBAL} ${options} \
'-DBUILD_SHARED_LIBS=OFF' \
"-DCMAKE_C_FLAGS=${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${CFLAGS} ${CPPFLAGS} ${_LDFLAGS_GLOBAL} ${LIBS}" \
"-DCMAKE_CXX_FLAGS=${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${CFLAGS} ${CPPFLAGS} ${_LDFLAGS_GLOBAL} ${LIBS} ${_CXXFLAGS_GLOBAL} ${_LDFLAGS_CXX_GLOBAL}"
"-DCMAKE_C_FLAGS=${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${CFLAGS} ${_LDFLAGS_GLOBAL} ${LIBS}" \
"-DCMAKE_CXX_FLAGS=${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${CFLAGS} ${_LDFLAGS_GLOBAL} ${LIBS} ${_CXXFLAGS_GLOBAL} ${_LDFLAGS_CXX_GLOBAL}"
fi

cmake --build "${_BLDDIR}" # --verbose
Expand Down

0 comments on commit 10226ec

Please sign in to comment.