Skip to content

Commit

Permalink
stable lib order
Browse files Browse the repository at this point in the history
  • Loading branch information
kennykerr committed Nov 28, 2024
1 parent 6076b63 commit ba0c3c1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions crates/libs/bindgen/src/libraries.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ pub enum CallingConvention {

// Returns the libraries and their function and stack sizes used by the gnu and msvc tools to build the umbrella libs.
#[doc(hidden)]
pub fn libraries() -> HashMap<String, BTreeMap<String, CallingConvention>> {
let mut libraries = HashMap::new();
pub fn libraries() -> BTreeMap<String, BTreeMap<String, CallingConvention>> {
let mut libraries = BTreeMap::new();

let reader = Reader::new(expand_input(&["default"]));
combine_libraries(reader, &mut libraries);
Expand All @@ -18,7 +18,7 @@ pub fn libraries() -> HashMap<String, BTreeMap<String, CallingConvention>> {

fn combine_libraries(
reader: &Reader,
libraries: &mut HashMap<String, BTreeMap<String, CallingConvention>>,
libraries: &mut BTreeMap<String, BTreeMap<String, CallingConvention>>,
) {
for types in reader.values() {
for ty in types.values() {
Expand Down
Binary file modified crates/targets/x86_64_msvc/lib/windows.0.52.0.lib
Binary file not shown.
4 changes: 2 additions & 2 deletions crates/tools/gnu/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::collections::{BTreeMap, HashMap, HashSet};
use std::collections::{BTreeMap, HashSet};
use std::io::prelude::*;
use std::process::{Command, Stdio};
use windows_bindgen::*;
Expand Down Expand Up @@ -169,7 +169,7 @@ EXPORTS
fn build_mri(
output: &std::path::Path,
ar: &str,
libraries: &HashMap<String, BTreeMap<String, CallingConvention>>,
libraries: &BTreeMap<String, BTreeMap<String, CallingConvention>>,
) {
let mri_path = output.join("unified.mri");
let mut mri = std::fs::File::create(&mri_path).unwrap();
Expand Down

0 comments on commit ba0c3c1

Please sign in to comment.