Move macho linker patch to new jiri-profile-v23 path.
The patch was one of the few files still left in jiri-v23-profile. It
also updates the darwin section to a more canonical use of filepath.Join.
Change-Id: I3d41d505674f7ce6e17811619fc527704ba2b5c8
diff --git a/jiri-profile-v23/go_profile/go.go b/jiri-profile-v23/go_profile/go.go
index b7af619..2c8b69a 100644
--- a/jiri-profile-v23/go_profile/go.go
+++ b/jiri-profile-v23/go_profile/go.go
@@ -559,8 +559,8 @@
vars := []string{
"CGO_ENABLED=1",
- "CC_FOR_TARGET=" + filepath.Join(jirix.Root, "release/swift/clang/clangwrap.sh"),
- "CXX_FOR_TARGET=" + filepath.Join(jirix.Root, "release/swift/clang/clangwrap++.sh"),
+ "CC_FOR_TARGET=" + filepath.Join(jirix.Root, "release", "swift", "clang", "clangwrap.sh"),
+ "CXX_FOR_TARGET=" + filepath.Join(jirix.Root, "release", "swift", "clang", "clangwrap++.sh"),
"GOOS=darwin",
"GOHOSTARCH=amd64",
"GOHOSTOS=darwin",
@@ -579,7 +579,7 @@
// Add patch for text-relocation errors on arm64
// Submitted to golang, currently marked for 1.7: https://go-review.googlesource.com/#/c/19206/
- patchPath := filepath.Join(jirix.Root, "release/go/src/v.io/x/devtools/jiri-v23-profile/go/macho_linker.patch")
+ patchPath := filepath.Join(jirix.Root, "release", "go", "src", "v.io", "x", "devtools", "jiri-profile-v23", "go_profile", "macho_linker.patch")
m.spec.patchFiles = append(m.spec.patchFiles, patchPath)
return "", vars, nil
}
diff --git a/jiri-v23-profile/go/macho_linker.patch b/jiri-profile-v23/go_profile/macho_linker.patch
similarity index 100%
rename from jiri-v23-profile/go/macho_linker.patch
rename to jiri-profile-v23/go_profile/macho_linker.patch
