Skip to content

Commit

Permalink
chore(build) naming convention
Browse files Browse the repository at this point in the history
  • Loading branch information
locao authored and gszr committed Jul 10, 2023
1 parent a0b771b commit b55e56a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ bool_flag(

# --//:wasmx_module=dynamic
string_flag(
name = "wasmx_module",
name = "wasmx_module_flag",
build_setting_default = "dynamic",
values = [
"dynamic",
Expand All @@ -177,19 +177,19 @@ config_setting(
)

config_setting(
name = "wasmx_static_mod_flag",
name = "wasmx_static_mod",
flag_values = {
":wasmx": "true",
":wasmx_module": "static",
":wasmx_module_flag": "static",
},
visibility = ["//visibility:public"],
)

config_setting(
name = "wasmx_dynamic_mod_flag",
name = "wasmx_dynamic_mod",
flag_values = {
":wasmx": "true",
":wasmx_module": "dynamic",
":wasmx_module_flag": "dynamic",
},
visibility = ["//visibility:public"],
)
Expand Down
4 changes: 2 additions & 2 deletions build/openresty/BUILD.openresty.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ CONFIGURE_OPTIONS = [
],
"//conditions:default": [],
}) + select({
"@kong//:wasmx_static_mod_flag": [
"@kong//:wasmx_static_mod": [
"--add-module=$$EXT_BUILD_ROOT$$/external/ngx_wasm_module",
# FIXME: this is a workaround for rhel/centos builds, when enabled breaks
# the build for macos
Expand All @@ -242,7 +242,7 @@ CONFIGURE_OPTIONS = [
# * https://github.com/Kong/ngx_wasm_module/blob/e70a19f53e1dda99d016c5cfa393652720959afd/util/Dockerfiles/Dockerfile.amd64.centos7#L9-L11
#"--with-ld-opt=\"-Wl,--allow-multiple-definition\"",
],
"@kong//:wasmx_dynamic_mod_flag": [
"@kong//:wasmx_dynamic_mod": [
"--with-compat",
"--add-dynamic-module=$$EXT_BUILD_ROOT$$/external/ngx_wasm_module",
],
Expand Down

0 comments on commit b55e56a

Please sign in to comment.