Skip to content

P
protobuf-c
Commit d6ac08c8 authored by Zex's avatar Zex Committed by Robert Edmonds
Browse files
Options

skip protoc-c tests on cross-compiling

parent 40136558
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
Makefile.am
View file @ d6ac08c8
...@@ -111,6 +111,12 @@ protoc_c_protoc_c_LDADD = \ ...@@ -111,6 +111,12 @@ protoc_c_protoc_c_LDADD = \
# protobuf-c tests # protobuf-c tests
# #
if CROSS_COMPILING
#
# skip tests on cross-compiling
#
else
LOG_COMPILER = $(VALGRIND) LOG_COMPILER = $(VALGRIND)
check_PROGRAMS += \ check_PROGRAMS += \
...@@ -175,6 +181,7 @@ t_version_version_SOURCES = \ ...@@ -175,6 +181,7 @@ t_version_version_SOURCES = \
t/version/version.c t/version/version.c
t_version_version_LDADD = \ t_version_version_LDADD = \
protobuf-c/libprotobuf-c.la protobuf-c/libprotobuf-c.la
endif # CROSS_COMPILING
endif # BUILD_COMPILER endif # BUILD_COMPILER
......
configure.ac
View file @ d6ac08c8
...@@ -67,6 +67,7 @@ else ...@@ -67,6 +67,7 @@ else
PROTOBUF_VERSION="not required, not building compiler" PROTOBUF_VERSION="not required, not building compiler"
fi fi
AM_CONDITIONAL([BUILD_COMPILER], [test "x$enable_protoc" != "xno"]) AM_CONDITIONAL([BUILD_COMPILER], [test "x$enable_protoc" != "xno"])
AM_CONDITIONAL([CROSS_COMPILING], [test "x$cross_compiling" != "xno"])
gl_LD_VERSION_SCRIPT gl_LD_VERSION_SCRIPT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment