aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorAdam Cozzette <acozzette@google.com>2017-01-03 13:07:21 -0800
committerAdam Cozzette <acozzette@google.com>2017-01-03 13:14:39 -0800
commitb40d318650ccde8893400c32814df6f4cdd24fe5 (patch)
tree25858a46061ed5904adad12b0f4e92049b1ac0b1 /configure.ac
parent4cb113a91b180559f0eedbca0244ef1181a7204c (diff)
downloadprotobuf-b40d318650ccde8893400c32814df6f4cdd24fe5.tar.gz
protobuf-b40d318650ccde8893400c32814df6f4cdd24fe5.tar.bz2
protobuf-b40d318650ccde8893400c32814df6f4cdd24fe5.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 d1e913c6..10fbdbd2 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])