mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1228703 - rustc 1.4.0 build for MacOS X with 32+64 bit support. r=mshal
Update tooltool manifest for macosx with a custom build of rustc 1.4.0 with --enable-rpath --disable-elf-tls and MACOSX_DEPLOYMENT_TARGET=10.7 on MacOS X 10.10.5, Xcode 7.1.1 (clang-700.1.76). Built for x86_64-apple-darwin with the rustlib from a separate i686-apple-darwin build copied into the tree to support 32-bit cross for universal builds. Since we've enabled rpath, we can drop the DYLD_LIBRARY_PATH setting from mozconfig.rust. This method seems cleaner since the add/append decision for DYLD_LIBRARY_PATH is verbose in shell.
This commit is contained in:
parent
5b3e29168b
commit
7429c083ce
@ -10,17 +10,17 @@
|
||||
"unpack": true
|
||||
},
|
||||
{
|
||||
"size": 128301120,
|
||||
"digest": "d2d71103a6cec84b150b8f08bfef2682aa713c2d6eadce584f79836ef27ba4380ffb444165d999b79605f18ad165641a7a8cc0e04a201675ad5f655a59adbda9",
|
||||
"algorithm": "sha512",
|
||||
"filename": "rustc.tar.bz2",
|
||||
"unpack": true
|
||||
},
|
||||
{
|
||||
"size": 167175,
|
||||
"digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
|
||||
"algorithm": "sha512",
|
||||
"filename": "sccache.tar.bz2",
|
||||
"unpack": true
|
||||
},
|
||||
{
|
||||
"algorithm": "sha512",
|
||||
"filename": "rustc.tar.bz2",
|
||||
"unpack": true,
|
||||
"digest": "28e0d27846cfa6fac5be2df4debb469b6f488d45357d21f2bec14c7c2b6abe5713965497961e7ac10120d3687751ccced95b9498cc54c529cbdfcd59d51a67ec",
|
||||
"size": 84116661
|
||||
}
|
||||
]
|
||||
|
@ -2,6 +2,5 @@
|
||||
|
||||
if test `uname -s` != Linux; then
|
||||
RUSTC="$topsrcdir/rustc/bin/rustc"
|
||||
mk_add_options "export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$topsrcdir/rustc/lib"
|
||||
ac_add_options --enable-rust
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user