aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorAdam Cozzette <acozzette@google.com>2017-01-03 13:07:21 -0800
committerBo Yang <paulyang1211@gmail.com>2017-01-09 11:41:39 -0800
commit77e434de36cf549bfba97782bfa6a58206b89e75 (patch)
tree4a4a460f29f97c570a7c156047eaf2e1b65d16f2 /configure.ac
parent46dee43e25767201bdcb61012a7d16e4a456ee2c (diff)
downloadprotobuf-77e434de36cf549bfba97782bfa6a58206b89e75.tar.gz
protobuf-77e434de36cf549bfba97782bfa6a58206b89e75.tar.bz2
protobuf-77e434de36cf549bfba97782bfa6a58206b89e75.zip
Fixed cross compilations with the Autotools build
Pull request #2517 caused cross compilations to start failing, because the js_embed binary was being built to run on the target platform instead of on the build machine. This change updates the Autotools build to use the AX_PROG_CXX_FOR_BUILD macro to find a suitable compiler for the build machine and always use that when building js_embed.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac1
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index a8c2c3d1..6d9c2a01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,7 @@ AC_ARG_WITH([protoc],
# Checks for programs.
AC_PROG_CC
AC_PROG_CXX
+AC_PROG_CXX_FOR_BUILD
AC_LANG([C++])
ACX_USE_SYSTEM_EXTENSIONS
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])