Skip to content

Commit 44de3d2

Browse files
authored
aws-lc-sys: output only one library (#749)
1 parent bfe34e8 commit 44de3d2

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

aws-lc-sys/builder/cc_builder.rs

+6-5
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ impl CcBuilder {
330330
cc_build
331331
}
332332

333-
fn add_all_files(&self, lib: &Library, cc_build: &mut cc::Build) {
333+
fn add_all_files(&self, lib: &Library, cc_build: &mut cc::Build) -> Vec<PathBuf> {
334334
use core::str::FromStr;
335335
cc_build.file(PathBuf::from_str("rust_wrapper.c").unwrap());
336336

@@ -368,19 +368,20 @@ impl CcBuilder {
368368
cc_build.file(source_path);
369369
}
370370
}
371-
s2n_bignum_builder.compile("s2n_bignum");
371+
s2n_bignum_builder.compile_intermediates()
372372
}
373373

374374
fn build_library(&self, lib: &Library) {
375375
let mut cc_build = self.prepare_builder();
376-
377-
self.add_all_files(lib, &mut cc_build);
378-
379376
for flag in lib.flags {
380377
cc_build.flag(flag);
381378
}
382379
self.run_compiler_checks(&mut cc_build);
383380

381+
let object_files = self.add_all_files(lib, &mut cc_build);
382+
for object in object_files {
383+
cc_build.object(object);
384+
}
384385
if let Some(prefix) = &self.build_prefix {
385386
cc_build.compile(format!("{}_crypto", prefix.as_str()).as_str());
386387
} else {

0 commit comments

Comments
 (0)