Merge from master.

davidgiven · May 1, 2024 · 6e5abd1 · 6e5abd1
2 parents 653a6a0 + 34f9738
commit 6e5abd1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/build/protobuf.py b/build/protobuf.py
@@ -11,7 +11,7 @@
 )
 from build.c import cxxlibrary
 from types import SimpleNamespace
-import build.pkg
+from build.pkg import package
 
 emit(
     """
@@ -22,6 +22,7 @@
 """
 )
 
+lib = package(name="protobuf_lib", package="protobuf")
 
 @Rule
 def proto(self, name, srcs: Targets = None, deps: Targets = None):
@@ -67,6 +68,6 @@ def protocc(self, name, srcs: Targets = None, deps: Targets = None):
     cxxlibrary(
         replaces=self,
         srcs=[r],
-        deps=targetswithtraitsof(deps, "cheaders"),
+        deps=targetswithtraitsof(deps, "cheaders") + [lib],
         hdrs=headers,
     )
diff --git a/scripts/encodedecodetest.sh b/scripts/encodedecodetest.sh
@@ -21,7 +21,7 @@ if [ ! -s $destfile ]; then
 	exit 1
 fi
 
-truncate $srcfile -r $destfile
+truncate -r $destfile $srcfile
 if ! cmp $srcfile $destfile; then
 	echo "Comparison failed!" >&2
 	exit 1