diff options
| -rw-r--r-- | script-overrides/stable-1.19.0/build_std.txt | 5 | ||||
| -rw-r--r-- | script-overrides/stable-1.19.0/build_unwind.txt | 1 | ||||
| -rw-r--r-- | tools/minicargo/manifest.cpp | 9 |
3 files changed, 14 insertions, 1 deletions
diff --git a/script-overrides/stable-1.19.0/build_std.txt b/script-overrides/stable-1.19.0/build_std.txt new file mode 100644 index 00000000..062afd95 --- /dev/null +++ b/script-overrides/stable-1.19.0/build_std.txt @@ -0,0 +1,5 @@ +# TODO: THis is the windows set +cargo:rustc-link-lib=advapi32 +cargo:rustc-link-lib=ws2_32 +cargo:rustc-link-lib=userenv +cargo:rustc-link-lib=shell32
\ No newline at end of file diff --git a/script-overrides/stable-1.19.0/build_unwind.txt b/script-overrides/stable-1.19.0/build_unwind.txt new file mode 100644 index 00000000..aba1574a --- /dev/null +++ b/script-overrides/stable-1.19.0/build_unwind.txt @@ -0,0 +1 @@ +# On both windows (MSVC) and linux (glibc), nothing is needed
\ No newline at end of file diff --git a/tools/minicargo/manifest.cpp b/tools/minicargo/manifest.cpp index aab0adac..4e7ec305 100644 --- a/tools/minicargo/manifest.cpp +++ b/tools/minicargo/manifest.cpp @@ -343,7 +343,14 @@ void PackageManifest::load_build_script(const ::std::string& path) // cargo:rustc-link-lib=mysql else if( key == "rustc-link-lib" ) { // TODO: Check for an = (otherwise default to dynamic) - throw ::std::runtime_error("TODO: rustc-link-lib"); + ::std::string lazy = value; + auto pos = lazy.find_first_of('='); + if(pos == ::std::string::npos) { + rv.rustc_link_lib.push_back(::std::make_pair("static", lazy)); + } + else { + throw ::std::runtime_error("TODO: rustc-link-lib"); + } } // cargo:rustc-cfg=foo else if( key == "rustc-cfg" ) { |