-
Notifications
You must be signed in to change notification settings - Fork 10
Expand file tree
/
Copy path0004-fix-bazel-compl.patch
More file actions
63 lines (58 loc) · 1.92 KB
/
0004-fix-bazel-compl.patch
File metadata and controls
63 lines (58 loc) · 1.92 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
From fd8c124e5968547a82fecc92e6081fdd71a4b49a Mon Sep 17 00:00:00 2001
From: Jeremy Yang <jyang@cockroachlabs.com>
Date: Tue, 13 Feb 2024 10:17:56 -0800
Subject: [PATCH] fix bazel compilation for grunning
---
pkg/util/grunning/disabled.go | 5 -----
pkg/util/grunning/enabled.go | 27 ---------------------------
2 files changed, 32 deletions(-)
delete mode 100644 pkg/util/grunning/enabled.go
diff --git a/pkg/util/grunning/disabled.go b/pkg/util/grunning/disabled.go
index f175eb2..89fcb2d 100644
--- a/pkg/util/grunning/disabled.go
+++ b/pkg/util/grunning/disabled.go
@@ -8,11 +8,6 @@
// by the Apache License, Version 2.0, included in the file
// licenses/APL.txt.
-// See grunning.Supported() for an explanation behind this build tag.
-//
-//go:build (linux && s390x) || !bazel
-// +build linux,s390x !bazel
-
package grunning
func grunningnanos() int64 { return 0 }
diff --git a/pkg/util/grunning/enabled.go b/pkg/util/grunning/enabled.go
deleted file mode 100644
index f8cd1b5..0000000
--- a/pkg/util/grunning/enabled.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2022 The Cockroach Authors.
-//
-// Use of this software is governed by the Business Source License
-// included in the file licenses/BSL.txt.
-//
-// As of the Change Date specified in that file, in accordance with
-// the Business Source License, use of this software will be governed
-// by the Apache License, Version 2.0, included in the file
-// licenses/APL.txt.
-
-// See grunning.Supported() for an explanation behind this build tag.
-//
-//go:build !((linux && s390x) || !bazel)
-// +build !linux !s390x
-// +build bazel
-
-package grunning
-
-import _ "unsafe" // for go:linkname
-
-// grunningnanos returns the running time observed by the current goroutine by
-// linking to a private symbol in the (patched) runtime package.
-//
-//go:linkname grunningnanos runtime.grunningnanos
-func grunningnanos() int64
-
-func supported() bool { return true }
--
2.38.1