From 3b0cf7dacb642fa18f6da21dc649c15b0abbd15f Mon Sep 17 00:00:00 2001 From: jheaff1 <48310225+jheaff1@users.noreply.github.com> Date: Wed, 22 Jun 2022 20:35:28 +0100 Subject: [PATCH] Faciliate usage of jom (#932) --- foreign_cc/configure.bzl | 2 +- foreign_cc/make.bzl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/foreign_cc/configure.bzl b/foreign_cc/configure.bzl index 34f1f0d3..781f3abd 100644 --- a/foreign_cc/configure.bzl +++ b/foreign_cc/configure.bzl @@ -82,7 +82,7 @@ def _create_configure_script(configureParameters): for target in ctx.attr.targets: # Configure will have generated sources into `$BUILD_TMPDIR` so make sure we `cd` there - make_commands.append("{prefix}{make} -C $$BUILD_TMPDIR$$ {target} {args}".format( + make_commands.append("{prefix}{make} {target} {args}".format( prefix = prefix, make = attrs.make_path, args = args, diff --git a/foreign_cc/make.bzl b/foreign_cc/make.bzl index 2ccb029c..1daf7d37 100644 --- a/foreign_cc/make.bzl +++ b/foreign_cc/make.bzl @@ -58,7 +58,7 @@ def _create_make_script(configureParameters): make_commands = [] prefix = "{} ".format(expand_locations_and_make_variables(ctx, attrs.tool_prefix, "tool_prefix", data)) if attrs.tool_prefix else "" for target in ctx.attr.targets: - make_commands.append("{prefix}{make} -C $$BUILD_TMPDIR$$ {target} {args} PREFIX={install_prefix}".format( + make_commands.append("{prefix}{make} {target} {args} PREFIX={install_prefix}".format( prefix = prefix, make = attrs.make_path, args = args,