motiejus/hermetic_cc_toolchain
1
Fork 0
Code Releases Activity

fix tool paths for different OSes/environments

Browse Source
This commit is contained in:
Motiejus Jakštys 2022-10-01 14:39:59 +03:00
parent 9b510810cc
commit 8919c5b703
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
toolchain/defs.bzl
View File

@ -95,7 +95,7 @@ _ZIG_TOOLS = [
_ZIG_TOOL_WRAPPER_WINDOWS_CACHE_KNOWN = """@echo off _ZIG_TOOL_WRAPPER_WINDOWS_CACHE_KNOWN = """@echo off
if exist "external\\zig_sdk\\lib\\*" goto :have_external_zig_sdk_lib 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 goto :set_zig_lib_dir
:have_external_zig_sdk_lib :have_external_zig_sdk_lib
set ZIG_LIB_DIR=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 _ZIG_TOOL_WRAPPER_WINDOWS_CACHE_GUESS = """@echo off
if exist "external\\zig_sdk\\lib\\*" goto :have_external_zig_sdk_lib 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 goto :set_zig_lib_dir
:have_external_zig_sdk_lib :have_external_zig_sdk_lib
set ZIG_LIB_DIR=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 if [ -d external/zig_sdk/lib ]; then
ZIG_LIB_DIR=external/zig_sdk/lib ZIG_LIB_DIR=external/zig_sdk/lib
else else
ZIG_LIB_DIR="$(dirname "$0")/../lib" ZIG_LIB_DIR="$(dirname "$0")/../../lib"
fi fi
export ZIG_LIB_DIR export ZIG_LIB_DIR
export ZIG_LOCAL_CACHE_DIR="{cache_prefix}/bazel-zig-cc" export ZIG_LOCAL_CACHE_DIR="{cache_prefix}/bazel-zig-cc"