Skip to content

Commit

Permalink
[skip ci] minor improvements (#1278)
Browse files Browse the repository at this point in the history
  • Loading branch information
4eUeP committed Feb 14, 2023
1 parent d18d3fa commit 2bfeb36
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ thrift::
grpc:: grpc-cpp grpc-hs

grpc-hs-deps::
# Always install proto-lens-protoc to avoid inconsistency
(cd ~ && cabal install -j$(CABAL_BUILD_PARALLEL) --overwrite-policy=always proto-lens-protoc)
# 1. Always install proto-lens-protoc to avoid inconsistency
# 2. Change to a temporary dir to avoid create hstream dists.
(cd $(shell mktemp -d) && \
cabal install -j$(CABAL_BUILD_PARALLEL) --overwrite-policy=always proto-lens-protoc)
($(CABAL) build -j$(CABAL_BUILD_PARALLEL) --project-file $(CABAL_PROJECT_FILE) proto3-suite && \
mkdir -p ~/.cabal/bin && \
$(CABAL) exec --project-file $(CABAL_PROJECT_FILE) \
Expand Down
8 changes: 3 additions & 5 deletions script/dev-tools
Original file line number Diff line number Diff line change
Expand Up @@ -935,9 +935,7 @@ class QuickBuildDevImageCommand:
p.add_argument("--tag", "-t", required=True, help="target image tag")
p.add_argument("--use-grpc-haskell", default=False, action="store_true")
p.add_argument("--donot-rename-exe", default=False, action="store_true")
p.add_argument(
"--enable-debug-info", default=False, action="store_true"
)
p.add_argument("--debug", default=False, action="store_true")
p.add_argument("--ghc-options", required=False, default="")
p.add_argument("--fast", default=False, action="store_true")
p.add_argument("--only-hstream", default=False, action="store_true")
Expand All @@ -951,14 +949,14 @@ class QuickBuildDevImageCommand:
builder_image,
use_grpc_haskell=False,
donot_rename_exe=False,
enable_debug_info=False,
debug=False,
fast=False,
only_hstream=False,
project_file="cabal.project",
ghc_options="",
**kargs,
):
debug_arg = "--enable-debug-info" if enable_debug_info else ""
debug_arg = "--enable-debug-info --ghc-options=-debug" if debug else ""
hsgrpc_arg = (
" ".join(
[
Expand Down

0 comments on commit 2bfeb36

Please sign in to comment.