diff options
| author | Alexander Hill <ahill@breadpudding.dev> | 2025-05-07 23:48:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-07 23:48:24 -0400 |
| commit | 8cf38995bef27e1a99bce57f561e34f792c83a17 (patch) | |
| tree | 7e35b5c3f135e75ff2192e69fc8cee567f28d807 /patches/mrustc-maple.patch | |
| parent | c971eb2f31746e5e6c84c12baa4009e7b2764ba8 (diff) | |
| parent | 63b8964cdb52ae6709c19465e034f8a516953ad9 (diff) | |
Merge pull request #3 from NicksWorld/main
Initial functional rustc and cargo
Diffstat (limited to 'patches/mrustc-maple.patch')
| -rw-r--r-- | patches/mrustc-maple.patch | 36 |
1 files changed, 11 insertions, 25 deletions
diff --git a/patches/mrustc-maple.patch b/patches/mrustc-maple.patch index 37f4a82..97d6018 100644 --- a/patches/mrustc-maple.patch +++ b/patches/mrustc-maple.patch @@ -372,28 +372,14 @@ diff -ruN mrustc-0.11.2.orig/src/trans/target.cpp mrustc-0.11.2/src/trans/target // If there's a '/' or a '\' in the filename, open it as a path, otherwise assume it's a triple. if( target_name.find('/') != ::std::string::npos || target_name.find('\\') != ::std::string::npos ) { -diff -ruN mrustc-0.11.2.orig/tools/minicargo/build.cpp mrustc-0.11.2/tools/minicargo/build.cpp ---- mrustc-0.11.2.orig/tools/minicargo/build.cpp 2025-05-05 20:46:46.568933202 -0400 -+++ mrustc-0.11.2/tools/minicargo/build.cpp 2025-05-06 22:49:13.710034817 -0400 -@@ -19,6 +19,7 @@ - #include "os.hpp" - #include <fstream> - #include <cassert> -+#include <cstdint> - - #include <unordered_map> - #include <algorithm> // sort/find_if -@@ -823,9 +824,10 @@ - if( true ) { - args.push_back("--cfg"); args.push_back("debug_assertions"); - } -- if( true /*parent.m_opts.enable_optimise*/ ) { -- args.push_back("-O"); -- } -+ // Patched for Maple Linux. See build-chroot.sh for details. ~ahill -+ //if( true /*parent.m_opts.enable_optimise*/ ) { -+ // args.push_back("-O"); -+ //} - if( parent.m_opts.emit_mmir ) { - args.push_back("-C"); args.push_back("codegen-type=monomir"); - } +diff -ruN mrustc-0.11.2.orig/src/trans/codegen_c.cpp mrustc-0.11.2/src/trans/codegen_c.cpp +--- mrustc-0.11.2.orig/src/trans/codegen_c.cpp 2024-12-29 22:28:18.000000000 -0500 ++++ mrustc-0.11.2/src/trans/codegen_c.cpp 2025-05-07 12:57:51.573401275 -0400 +@@ -1295,6 +1295,7 @@ + { + args.push_back("-g"); + } ++ args.push_back("-fno-delete-null-pointer-checks"); + // TODO: Why? + args.push_back("-fPIC"); + args.push_back("-o"); |