bridge_icu: put the libicudata link hack here, where it belongs

Some pending work surfaced a problem where the icudata link order wasn't
correct in some situations. Putting the link ordering hack with the rest
of the ICU logic fixes things.

Author: pkgw

Cargo.toml

@@ -159,7 +159,7 @@ tectonic_bridge_core = "thiscommit:2023-06-11:PvhF7YB"
 tectonic_bridge_flate = "thiscommit:2021-01-01:eer4ahL4"
 tectonic_bridge_graphite2 = "2c1ffcd702a662c003bd3d7d0ca4d169784cb6ad"
 tectonic_bridge_harfbuzz = "2c1ffcd702a662c003bd3d7d0ca4d169784cb6ad"
-tectonic_bridge_icu = "2c1ffcd702a662c003bd3d7d0ca4d169784cb6ad"
+tectonic_bridge_icu = "thiscommit:2023-09-17:AwTXf3W"
 tectonic_bundles = "thiscommit:2022-03-29:SFnXSaL"
 tectonic_cfg_support = "thiscommit:aeRoo7oa"
 tectonic_dep_support = "5faf4205bdd3d31101b749fc32857dd746f9e5bc"

crates/bridge_icu/build.rs

@@ -7,7 +7,7 @@
 //! this crate is needed. Vendoring the ICU library is almost certainly not
 //! something that one should do.
 
-use tectonic_dep_support::{Configuration, Dependency, Spec};
+use tectonic_dep_support::{Backend, Configuration, Dependency, Spec};
 
 struct IcuSpec;
 
@@ -22,6 +22,7 @@ impl Spec for IcuSpec {
 }
 
 fn main() {
+    let target = std::env::var("TARGET").unwrap();
     let cfg = Configuration::default();
     let dep = Dependency::probe(IcuSpec, &cfg);
 
@@ -39,4 +40,14 @@ fn main() {
     println!();
 
     dep.emit();
+
+    // vcpkg-rs is not guaranteed to emit libraries in the order required by a
+    // single-pass linker, so we might need to make sure that's done right.
+
+    if cfg.backend == Backend::Vcpkg && target.contains("-linux-") {
+        // add icudata to the end of the list of libs as vcpkg-rs
+        // does not order individual libraries as a single pass
+        // linker requires.
+        println!("cargo:rustc-link-lib=icudata");
+    }
 }

crates/xetex_layout/Cargo.toml

@@ -5,7 +5,7 @@
 
 [package]
 name = "tectonic_xetex_layout"
-version = "0.0.0-dev.0"  # assigned with cranko (see README)
+version = "0.0.0-dev.0" # assigned with cranko (see README)
 authors = ["Peter Williams <peter@newton.cx>"]
 description = """
 XeTeX's font loading and layout interface encapsulation, as a crate.
@@ -38,6 +38,6 @@ tectonic_bridge_core = "thiscommit:2021-01-16:wie2Ejoh"
 tectonic_bridge_graphite2 = "2722731f9e32c6963fe8c8566a201b33672c5c5a"
 tectonic_bridge_freetype2 = "2c1ffcd702a662c003bd3d7d0ca4d169784cb6ad"
 tectonic_bridge_harfbuzz = "2c1ffcd702a662c003bd3d7d0ca4d169784cb6ad"
-tectonic_bridge_icu = "2c1ffcd702a662c003bd3d7d0ca4d169784cb6ad"
+tectonic_bridge_icu = "thiscommit:2023-09-17:6uIZ4lA"
 tectonic_cfg_support = "thiscommit:aeRoo7oa"
 tectonic_dep_support = "5faf4205bdd3d31101b749fc32857dd746f9e5bc"

crates/xetex_layout/build.rs

@@ -13,7 +13,7 @@ use std::{
     path::{Path, PathBuf},
 };
 use tectonic_cfg_support::target_cfg;
-use tectonic_dep_support::{Backend, Configuration, Dependency, Spec};
+use tectonic_dep_support::{Configuration, Dependency, Spec};
 
 struct FontconfigSpec;
 
@@ -188,16 +188,6 @@ fn main() {
 
     deps.emit();
 
-    // vcpkg-rs is not guaranteed to emit libraries in the order required by a
-    // single-pass linker, so we might need to make sure that's done right.
-
-    if dep_cfg.backend == Backend::Vcpkg && target.contains("-linux-") {
-        // add icudata to the end of the list of libs as vcpkg-rs
-        // does not order individual libraries as a single pass
-        // linker requires.
-        println!("cargo:rustc-link-lib=icudata");
-    }
-
     // Copy the static header file for C preprocessing convenience.
 
     let mut main_header_src = manifest_dir;