diff options
Diffstat (limited to 'contrib/depends/packages/native_mrustc.mk')
| -rw-r--r-- | contrib/depends/packages/native_mrustc.mk | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/contrib/depends/packages/native_mrustc.mk b/contrib/depends/packages/native_mrustc.mk index 86bdf42..2ec97a9 100644 --- a/contrib/depends/packages/native_mrustc.mk +++ b/contrib/depends/packages/native_mrustc.mk @@ -1,17 +1,11 @@ package=native_mrustc $(package)_version=0.11.0 $(package)_download_path=https://github.com/thepowersgang/mrustc/archive -$(package)_download_file=44013560b99ee8f351807d5ad4b64ba36bfe7d01.tar.gz +$(package)_download_file=06b87d1af49d2db3bd850fdee8888055dd540dd1.tar.gz $(package)_file_name=$(package)-$($(package)_version).tar.gz -$(package)_sha256_hash=a723f4f0fd63d0950ca6f8d0dcaf35fb1f34d5c683e552d44c7553ffdb57a343 +$(package)_sha256_hash=d3d3b84a100e71628afecf1125dbaa9bfc54ef9578c4fd81d75dca34c96f2565 $(package)_dependencies=native_ccache -define $(package)_set_vars -$(package)_config_opts= -$(package)_build_opts= -$(package)_build_env= -endef - define $(package)_preprocess_cmds cd $($(package)_extract_dir) && \ if [ -f script-overrides/stable-1.54.0-macos/build_std.txt ]; then \ @@ -22,7 +16,10 @@ define $(package)_preprocess_cmds echo 'Patching mrustc to work with clang on macOS' && \ sed -i.bak 's/-fno-tree-sra//g' Makefile && \ grep -rl -- "-fno-tree-sra" . | xargs sed -i.bak 's/-fno-tree-sra//g'; \ - fi + fi && \ + sed -i.bak 's/^make$$$$/make $$$$@/' build-1.54.0.sh &&\ + echo >> build-1.54.0.sh && \ + echo make -C run_rustc >> build-1.54.0.sh endef define $(package)_build_cmds @@ -31,11 +28,8 @@ define $(package)_build_cmds endef define $(package)_stage_cmds - mkdir -p $($(package)_staging_dir)/$(host_prefix)/native/bin $($(package)_staging_dir)/$(host_prefix)/native/lib && \ - cp bin/mrustc bin/minicargo $($(package)_staging_dir)/$(host_prefix)/native/bin && \ - cp -r output-1.54.0 $($(package)_staging_dir)/$(host_prefix)/native + mkdir -p $($(package)_staging_prefix_dir)/rust_1_54_0/bin && \ + cp -a run_rustc/output-1.54.0/prefix-2/bin/rustc $($(package)_staging_prefix_dir)/rust_1_54_0/bin && \ + cp -a run_rustc/output-1.54.0/prefix/bin/cargo $($(package)_staging_prefix_dir)/rust_1_54_0/bin && \ + cp -a run_rustc/output-1.54.0/prefix-2/lib $($(package)_staging_prefix_dir)/rust_1_54_0/lib endef - -define $(package)_postprocess_cmds - rm -rf $($(package)_staging_dir)/native/lib/output-1.54.0/rustc-build -endef
\ No newline at end of file |