Skip to content

Commit

Permalink
Write ash.h to tmp dir, rather than the GOROOT (#125)
Browse files Browse the repository at this point in the history
* Write ash.h to tmp dir, rather than the GOROOT

* Remove this validation

* No this one

* Wait for release
  • Loading branch information
Tatskaari authored Jun 20, 2023
1 parent 9d8b6db commit 5801c18
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions build_defs/go.build_defs
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ def go_library(name:str, srcs:list, resources:list=[], asm_srcs:list=None, hdrs:
},
outs = [name + '.abi'],
building_description = 'Creating ABI...',
cmd = f'eval `"$TOOL" env` && touch $GOROOT/pkg/include/go_asm.h && "$TOOL" tool asm -trimpath "$TMP_DIR" -I $GOROOT/pkg/include -D GOOS_{CONFIG.OS} -D GOARCH_{CONFIG.ARCH} -gensymabis -o "$OUT" $SRCS_ASM',
cmd = f'eval `"$TOOL" env` && mkdir include && touch include/go_asm.h && "$TOOL" tool asm -trimpath "$TMP_DIR" -I include -I $GOROOT/pkg/include -D GOOS_{CONFIG.OS} -D GOARCH_{CONFIG.ARCH} -gensymabis -o "$OUT" $SRCS_ASM',
env= {
"GOOS": CONFIG.OS,
"GOARCH": CONFIG.ARCH,
Expand Down Expand Up @@ -1134,8 +1134,6 @@ def go_repo(module: str, version:str=None, download:str=None, name:str=None, ins
visibility(list): The visibility for the returned "install" rule. Doesn't affect the subrepo at all.
"""
subrepo_name = _module_rule_name(module)
if install and not name:
fail("must provide `name` when exposing packages with `install = []`")

name = name or subrepo_name

Expand Down

0 comments on commit 5801c18

Please sign in to comment.