StarMirror/sandboxed-api
1
0
Fork 0
mirror of https://github.com/google/sandboxed-api.git synced 2024-03-22 13:11:30 +08:00
Code Issues Projects Releases Wiki Activity

Fix libffi configure directory in Bazel/CMake builds

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/libffi/CMakeLists.txt.in
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 ""

7
sandboxed_api/bazel/repositories.bzl
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,
) )