Fix linking

Author: CraftSpider

crates/bridge_freetype2/Cargo.toml

@@ -22,14 +22,12 @@ links = "freetype2"
 
 [dependencies]
 libc = "0.2"
+tectonic_bridge_png = { path = "../bridge_png", version = "0.0.0-dev.0" }
+tectonic_bridge_flate = { path = "../bridge_flate", version = "0.0.0-dev.0" }
 
 [build-dependencies]
 tectonic_dep_support = { path = "../dep_support", version = "0.0.0-dev.0" }
 
-[dev-dependencies]
-tectonic_bridge_png = { path = "../bridge_png", version = "0.0.0-dev.0" }
-tectonic_bridge_flate = { path = "../bridge_flate", version = "0.0.0-dev.0" }
-
 [package.metadata.internal_dep_versions]
 tectonic_dep_support = "5faf4205bdd3d31101b749fc32857dd746f9e5bc"
 tectonic_bridge_png = "42a1f6a8027b2ef01436be16c6e1bc27918f293f"

crates/bridge_freetype2/src/lib.rs

@@ -17,6 +17,15 @@ use std::{ptr, slice};
 
 mod sys;
 
+/// Import things from our bridge crates to ensure that we actually link with
+/// them.
+mod linkage {
+    #[allow(unused_imports)]
+    use tectonic_bridge_flate as clippyrenamehack1;
+    #[allow(unused_imports)]
+    use tectonic_bridge_png as clippyrenamehack2;
+}
+
 pub use sys::FT_BBox as BBox;
 pub use sys::FT_Fixed as Fixed;
 pub use sys::FT_Glyph_BBox_Mode as BBoxMode;
@@ -624,15 +633,6 @@ mod tests {
     use std::fs;
     use std::path::{Path, PathBuf};
 
-    /// Import things from our bridge crates to ensure that we actually link with
-    /// them.
-    mod linkage {
-        #[allow(unused_imports)]
-        use tectonic_bridge_flate as clippyrenamehack1;
-        #[allow(unused_imports)]
-        use tectonic_bridge_png as clippyrenamehack2;
-    }
-
     fn assets_dir() -> PathBuf {
         Path::new(env!("CARGO_MANIFEST_DIR"))
             .join("../../tests/assets")

crates/bridge_harfbuzz/build.rs

@@ -93,7 +93,6 @@ mod inner {
         }
 
         // Include paths exported by our internal dependencies:
-        let freetype2_include_path = env::var("DEP_FREETYPE2_INCLUDE_PATH").unwrap();
         let graphite2_include_path = env::var("DEP_GRAPHITE2_INCLUDE_PATH").unwrap();
         let graphite2_static = !env::var("DEP_GRAPHITE2_DEFINE_STATIC").unwrap().is_empty();
 
@@ -105,10 +104,6 @@ mod inner {
             .define("HAVE_GRAPHITE2", "1")
             .file("harfbuzz/src/harfbuzz.cc");
 
-        for item in freetype2_include_path.split(';') {
-            cfg.include(item);
-        }
-
         for item in graphite2_include_path.split(';') {
             cfg.include(item);
         }
@@ -143,10 +138,6 @@ mod inner {
             include_dir.to_str().expect("non-string-friendly OUT_DIR")
         );
 
-        for item in freetype2_include_path.split(';') {
-            print!(";{item}");
-        }
-
         for item in graphite2_include_path.split(';') {
             print!(";{item}");
         }

crates/bridge_harfbuzz/src/lib.rs

@@ -34,9 +34,9 @@ pub use sys::hb_segment_properties_t as SegmentProperties;
 /// link with them, to pull in the symbols defined in the C APIs.
 mod linkage {
     #[allow(unused_imports)]
-    use tectonic_bridge_freetype2 as clippyrenamehack2;
+    use tectonic_bridge_freetype2 as clippyrenamehack1;
     #[allow(unused_imports)]
-    use tectonic_bridge_graphite2 as clippyrenamehack1;
+    use tectonic_bridge_graphite2 as clippyrenamehack2;
     #[cfg(target_os = "macos")]
     #[allow(unused_imports)]
     use tectonic_mac_core as clippyrenamehack3;