From 8919c5b703300c5b401d3b443f8e40da914fa927 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Sat, 1 Oct 2022 14:39:59 +0300 Subject: [PATCH] fix tool paths for different OSes/environments --- toolchain/defs.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/toolchain/defs.bzl b/toolchain/defs.bzl index 4565941..ed4e402 100644 --- a/toolchain/defs.bzl +++ b/toolchain/defs.bzl @@ -95,7 +95,7 @@ _ZIG_TOOLS = [ _ZIG_TOOL_WRAPPER_WINDOWS_CACHE_KNOWN = """@echo off if exist "external\\zig_sdk\\lib\\*" goto :have_external_zig_sdk_lib -set ZIG_LIB_DIR=%~dp0\\..\\lib +set ZIG_LIB_DIR=%~dp0\\..\\..\\lib goto :set_zig_lib_dir :have_external_zig_sdk_lib set ZIG_LIB_DIR=external\\zig_sdk\\lib @@ -107,7 +107,7 @@ set ZIG_GLOBAL_CACHE_DIR=%ZIG_LOCAL_CACHE_DIR% _ZIG_TOOL_WRAPPER_WINDOWS_CACHE_GUESS = """@echo off if exist "external\\zig_sdk\\lib\\*" goto :have_external_zig_sdk_lib -set ZIG_LIB_DIR=%~dp0\\..\\lib +set ZIG_LIB_DIR=%~dp0\\..\\..\\lib goto :set_zig_lib_dir :have_external_zig_sdk_lib set ZIG_LIB_DIR=external\\zig_sdk\\lib @@ -127,7 +127,7 @@ set -e if [ -d external/zig_sdk/lib ]; then ZIG_LIB_DIR=external/zig_sdk/lib else - ZIG_LIB_DIR="$(dirname "$0")/../lib" + ZIG_LIB_DIR="$(dirname "$0")/../../lib" fi export ZIG_LIB_DIR export ZIG_LOCAL_CACHE_DIR="{cache_prefix}/bazel-zig-cc"