From 0d81d14d824fa4f5eb5af424c8965d536d7d2620 Mon Sep 17 00:00:00 2001 From: Hugues Morisset Date: Thu, 26 Oct 2023 16:25:18 +0200 Subject: [PATCH 1/3] Add _module parameter generated by please_go --- build_defs/cgo.build_defs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_defs/cgo.build_defs b/build_defs/cgo.build_defs index 1676732b..6edc7194 100644 --- a/build_defs/cgo.build_defs +++ b/build_defs/cgo.build_defs @@ -2,7 +2,7 @@ subinclude("///go//build_defs:go", "///cc//build_defs:c") def cgo_library(name:str, srcs:list=[], resources:list=None, go_srcs:list=[], c_srcs:list=[], hdrs:list=[], package:str=None, compiler_flags:list&cflags=[], linker_flags:list&ldflags=[], pkg_config:list=[], - subdir:str='', deps:list=[], visibility:list=None, test_only:bool&testonly=False, import_path:str=''): + subdir:str='', deps:list=[], visibility:list=None, test_only:bool&testonly=False, _module:str='', import_path:str=''): """Generates a Go library which can be reused by other rules. Note that by its nature this is something of a hybrid of Go and C rules. It can depend From 3d15272dc2534d8188764d0084e83c9f3c735af7 Mon Sep 17 00:00:00 2001 From: Hugues Morisset Date: Thu, 26 Oct 2023 16:26:10 +0200 Subject: [PATCH 2/3] Remove -Wno-error, include PKG_DIR --- build_defs/cgo.build_defs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_defs/cgo.build_defs b/build_defs/cgo.build_defs index 6edc7194..83a40520 100644 --- a/build_defs/cgo.build_defs +++ b/build_defs/cgo.build_defs @@ -97,7 +97,7 @@ def cgo_library(name:str, srcs:list=[], resources:list=None, go_srcs:list=[], c_ srcs = [cgo_rule + '|c'] + c_srcs, hdrs = [cgo_rule + '|h'] + hdrs, compiler_flags = compiler_flags + [ - '-Wno-error', + '-I', '"$PKG_DIR"', '-Wno-unused-parameter', # Generated code doesn't compile clean ], pkg_config_libs = pkg_config, From 4bbe9f88999bb38aee0eddefac884a47591d00f0 Mon Sep 17 00:00:00 2001 From: Hugues Morisset Date: Fri, 27 Oct 2023 17:02:09 +0200 Subject: [PATCH 3/3] Pass _module to go_library --- build_defs/cgo.build_defs | 1 + 1 file changed, 1 insertion(+) diff --git a/build_defs/cgo.build_defs b/build_defs/cgo.build_defs index 83a40520..ff0c9439 100644 --- a/build_defs/cgo.build_defs +++ b/build_defs/cgo.build_defs @@ -113,6 +113,7 @@ def cgo_library(name:str, srcs:list=[], resources:list=None, go_srcs:list=[], c_ deps = deps, _generate_import_config=False, import_path=import_path, + _module = _module, ) output = package if package else name