Merge pull request #37 from cblichmann:master

PiperOrigin-RevId: 302426325
Change-Id: I033c69ef18d8ccb5df5668c865846cb7df8fdf3a
This commit is contained in:
Copybara-Service 2020-03-23 07:08:34 -07:00
commit 8e83506380
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" SOURCE_DIR "${CMAKE_BINARY_DIR}/libffi-src"
CONFIGURE_COMMAND sh -c "./configure \ CONFIGURE_COMMAND sh -c "./configure \
--disable-dependency-tracking \ --disable-dependency-tracking \
&& (mv -t configure-cmake-gen `sh config.guess` || true)" && (mv `sh config.guess` configure-cmake-gen || true)"
BUILD_COMMAND "" BUILD_COMMAND ""
INSTALL_COMMAND "" INSTALL_COMMAND ""
TEST_COMMAND "" TEST_COMMAND ""

View File

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