Commit 3cae65b1 authored by Alexander Hansen Færøy's avatar Alexander Hansen Færøy 💬
Browse files

Merge branch 'ahf/macos-cross-build' into 'main' 

Fix reproducible build CI job for macOS

Closes #1394 and #1507

See merge request tpo/core/arti!2377
parents c04c4fc3 c884f359

.gitlab-ci.yml

+0 −2
Original line number Diff line number Diff line
@@ -406,8 +406,6 @@ build-repro-windows: 
      - arti-windows.exe



build-repro-macos:

  # Temporarily permitted to fail; see #1394

  allow_failure: true

  extends: .build-repro-template

  variables:

    TARGET: macos

Cargo.lock

+3 −2
Original line number Diff line number Diff line
@@ -943,12 +943,13 @@ version = "0.4.6" 


[[package]]

name = "cc"

version = "1.0.93"

version = "1.1.15"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "7a7e1056f2c248bb99dbb2e1100f26bf818fbfbcb6197377192fbb9575e5fc90"

checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6"

dependencies = [

 "jobserver",

 "libc",

 "shlex",

]



[[package]]

maint/reproducible_build

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ EOF 
	fi



	PATH="/arti/osxcross/target/bin:$PATH" \

		MACOSX_DEPLOYMENT_TARGET="10.7" \

		CC=o64-clang \

		CXX=o64-clang++ \

		cargo_build_arti --target x86_64-apple-darwin