skip protoc-c tests on cross-compiling

This commit is contained in:
Zex 2015-02-15 18:34:24 +08:00 committed by Robert Edmonds
parent 4013655890
commit d6ac08c8ba
2 changed files with 8 additions and 0 deletions

View File

@ -111,6 +111,12 @@ protoc_c_protoc_c_LDADD = \
# protobuf-c tests
#
if CROSS_COMPILING
#
# skip tests on cross-compiling
#
else
LOG_COMPILER = $(VALGRIND)
check_PROGRAMS += \
@ -175,6 +181,7 @@ t_version_version_SOURCES = \
t/version/version.c
t_version_version_LDADD = \
protobuf-c/libprotobuf-c.la
endif # CROSS_COMPILING
endif # BUILD_COMPILER

View File

@ -67,6 +67,7 @@ else
PROTOBUF_VERSION="not required, not building compiler"
fi
AM_CONDITIONAL([BUILD_COMPILER], [test "x$enable_protoc" != "xno"])
AM_CONDITIONAL([CROSS_COMPILING], [test "x$cross_compiling" != "xno"])
gl_LD_VERSION_SCRIPT