[Runner] Fix creation of GCC symlinks for BSD systems (#141)

JuliaPackaging · May 1, 2021 · 2b8947e · 2b8947e · giordano · May 1, 2021
1 parent c60ad8d
commit 2b8947e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "BinaryBuilderBase"
 uuid = "7f725544-6523-48cd-82d1-3fa08ff4056e"
 authors = ["Elliot Saba <staticfloat@gmail.com>"]
-version = "0.6.2"
+version = "0.6.3"
 
 [deps]
 CodecZlib = "944b1d66-785c-5afd-91f1-9de20f533193"

diff --git a/src/Runner.jl b/src/Runner.jl
@@ -698,14 +698,14 @@ function generate_compiler_wrappers!(platform::AbstractPlatform; bin_path::Abstr
  if Sys.isbsd(p) && os_version(p) !== nothing
  tmp_p = deepcopy(p)
  delete!(tags(tmp_p), "os_version")
- symlink("$(t)-gcc", joinpath(bin_path, "$(aatriplet(tmp_p))-gcc"))
+ symlink("$(t)-gcc", joinpath(bin_path, triplet(p), "$(aatriplet(tmp_p))-gcc"))
  end
  # Currently our Rust toolchain expects the linker for armv7l and
  # armv6l with the platform "*l" suffix in the platform. Until
  # https://github.com/JuliaPackaging/Yggdrasil/pull/2168 makes it to
  # the Rust toolchain, we create a symlink to work around this issue.
  if proc_family(p) == "arm" && nbits(p) == 32
- symlink("$(t)-gcc", joinpath(bin_path, "$(triplet(abi_agnostic(p)))-gcc"))
+ symlink("$(t)-gcc", joinpath(bin_path, triplet(p), "$(triplet(abi_agnostic(p)))-gcc"))
  end
  end
  end