Skip to content

Commit 58dc770

Browse files
author
TeleGhost Dev
committed
Fix AAR build: disable enum-constexpr-conversion and deprecated-builtins for Boost compatibility
1 parent f03ef41 commit 58dc770

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

.github/workflows/android.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,14 @@ jobs:
269269
I2P_INC="-I$GITHUB_WORKSPACE/internal/network/i2pd/i2pd/libi2pd -I$GITHUB_WORKSPACE/internal/network/i2pd/i2pd/libi2pd_client -I$GITHUB_WORKSPACE/internal/network/i2pd/i2pd/i18n -I$GITHUB_WORKSPACE/internal/network/i2pd/i2pd"
270270
DEP_INC="-I$GITHUB_WORKSPACE/$BOOST_INCLUDE_DIR -I$GITHUB_WORKSPACE/$OPENSSL_INCLUDE_DIR"
271271
272-
export CGO_CXXFLAGS="$I2P_INC $DEP_INC"
273-
export CGO_CFLAGS="$DEP_INC" # OpenSSL might be used in C
272+
# Fix for Boost + Clang compatibility:
273+
# -Wno-enum-constexpr-conversion: Fixes -1 outside range error in Boost MPL
274+
# -Wno-deprecated-builtins: Silences warnings about deprecated triviality checks
275+
# -D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_FUNCTION: Consistency with i2pd build
276+
EXTRA_FLAGS="-Wno-enum-constexpr-conversion -Wno-deprecated-builtins -D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_FUNCTION"
277+
278+
export CGO_CXXFLAGS="$I2P_INC $DEP_INC $EXTRA_FLAGS"
279+
export CGO_CFLAGS="$DEP_INC"
274280
275281
echo "CGO_CXXFLAGS: $CGO_CXXFLAGS"
276282

0 commit comments

Comments
 (0)