diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-08-26 00:10:40 +0200 |
|---|---|---|
| committer | James E. King, III <jking@apache.org> | 2017-09-09 07:50:54 -0700 |
| commit | 1744cdcb674a20c554ae9f23cb95c0c8eff63b90 (patch) | |
| tree | 66d9e670ea341177cd6ce56c6ca2e41a8bf07414 /test/cpp | |
| parent | cf892d46f6c1b295d99705709364c42ae2dc0158 (diff) | |
| download | thrift-1744cdcb674a20c554ae9f23cb95c0c8eff63b90.tar.gz | |
configure.ac, Makefile.am: introduce THRIFT variable to support cross-compilation
The thrift build system currently assumes that the thrift compiler is
always available in $(top_builddir)/compiler/cpp/thrift. However, in a
cross-compilation context, this location contains the thrift compiler
built for the target... which obviously will not run on the build
machine.
In order to support such cross-compilation situation, we introduce the
THRIFT variable as a an argument for the configure script (using
AC_ARG_VAR). If not specified, it defaults to the existing value of
using compiler/cpp/thrift from the build directory, but it can be
overridden when calling ./configure.
Note that $(top_builddir) cannot be used within the configure script,
so we simply use `pwd`, which is the same as the top_builddir.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This closes #1336
This closes #1350
Diffstat (limited to 'test/cpp')
| -rwxr-xr-x | test/cpp/Makefile.am | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/test/cpp/Makefile.am b/test/cpp/Makefile.am index e2c21f5dd..359e7e6dd 100755 --- a/test/cpp/Makefile.am +++ b/test/cpp/Makefile.am @@ -98,8 +98,6 @@ StressTestNonBlocking_LDADD = \ # # Common thrift code generation rules # -THRIFT = $(top_builddir)/compiler/cpp/thrift - gen-cpp/ThriftTest.cpp gen-cpp/ThriftTest_types.cpp gen-cpp/ThriftTest_constants.cpp: $(top_srcdir)/test/ThriftTest.thrift $(THRIFT) $(THRIFT) --gen cpp:templates,cob_style -r $< |