From 0c9a41413c21998e5cbe55974065295936c6f9b2 Mon Sep 17 00:00:00 2001
From: Fabian Meumertzheim <fabian@meumertzhe.im>
Date: Thu, 12 May 2022 17:56:58 +0200
Subject: [PATCH] Clean up rpath handling

---
 go/private/actions/link.bzl | 8 --------
 go/private/rules/binary.bzl | 6 ------
 2 files changed, 14 deletions(-)

diff --git a/go/private/actions/link.bzl b/go/private/actions/link.bzl
index 1a2e680004..3acbccbf80 100644
--- a/go/private/actions/link.bzl
+++ b/go/private/actions/link.bzl
@@ -20,7 +20,6 @@ load(
 )
 load(
     "//go/private:mode.bzl",
-    "LINKMODE_C_SHARED",
     "LINKMODE_NORMAL",
     "LINKMODE_PLUGIN",
     "extld_from_cc_toolchain",
@@ -108,13 +107,6 @@ def emit_link(
     if go.mode.link == LINKMODE_PLUGIN:
         tool_args.add("-pluginpath", archive.data.importpath)
 
-    # TODO: Rework when https://github.com/bazelbuild/bazel/pull/12304 is mainstream
-    if go.mode.link == LINKMODE_C_SHARED and (go.mode.goos in ["darwin", "ios"]):
-        extldflags.extend([
-            "-install_name",
-            rpath.install_name(executable),
-        ])
-
     arcs = _transitive_archives_without_test_archives(archive, test_archives)
     arcs.extend(test_archives)
     if (go.coverage_enabled and go.coverdata and
diff --git a/go/private/rules/binary.bzl b/go/private/rules/binary.bzl
index 2015f84d0f..8e98c1ffc0 100644
--- a/go/private/rules/binary.bzl
+++ b/go/private/rules/binary.bzl
@@ -41,10 +41,6 @@ load(
     "LINKMODE_PLUGIN",
     "LINKMODE_SHARED",
 )
-load(
-    "//go/private:rpath.bzl",
-    "rpath",
-)
 
 _EMPTY_DEPSET = depset([])
 
@@ -70,8 +66,6 @@ def new_cc_import(
         static_library = None,
         alwayslink = False,
         linkopts = []):
-    if dynamic_library:
-        linkopts = linkopts + rpath.flags(go, dynamic_library)
     return CcInfo(
         compilation_context = cc_common.create_compilation_context(
             defines = defines,