Fix libffi configure directory in Bazel/CMake builds

This commit is contained in:
Christian Blichmann 2020-03-23 13:52:02 +01:00
parent 45d825b3b7
commit 57d374e667
2 changed files with 4 additions and 5 deletions

View File

@ -22,7 +22,7 @@ ExternalProject_Add(libffi
SOURCE_DIR "${CMAKE_BINARY_DIR}/libffi-src"
CONFIGURE_COMMAND sh -c "./configure \
--disable-dependency-tracking \
&& (mv -t configure-cmake-gen `sh config.guess` || true)"
&& (mv `sh config.guess` configure-cmake-gen || true)"
BUILD_COMMAND ""
INSTALL_COMMAND ""
TEST_COMMAND ""

View File

@ -21,10 +21,9 @@ def _configure(ctx):
# Run configure script and move host-specific directory to a well-known
# location.
ctx.execute(
[bash_exe, "-c", """
./configure --disable-dependency-tracking {args}
mv -t configure-bazel-gen $(. config.guess) || true
""".format(args = " ".join(ctx.attr.configure_args))],
[bash_exe, "-c", """./configure --disable-dependency-tracking {args};
mv $(. config.guess) configure-bazel-gen || true
""".format(args = " ".join(ctx.attr.configure_args))],
quiet = ctx.attr.quiet,
)