File tree Expand file tree Collapse file tree 1 file changed +5
-5
lines changed Expand file tree Collapse file tree 1 file changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -39,19 +39,19 @@ pub fn build_zlib_ng(target: &str, compat: bool) {
3939 cmake. define ( "CMAKE_GENERATOR_PLATFORM" , "Win32" ) ;
4040 }
4141
42+ // libz-ng uses the GNUInstallDirs convention, so we can use the following
43+ // to ensure libraries are placed in a consistent place in the
44+ // installation dir.
45+ cmake. define ( "CMAKE_INSTALL_LIBDIR" , "lib" ) ;
46+
4247 let install_dir = cmake. build ( ) ;
4348
4449 let includedir = install_dir. join ( "include" ) ;
4550 let libdir = install_dir. join ( "lib" ) ;
46- let libdir64 = install_dir. join ( "lib64" ) ;
4751 println ! (
4852 "cargo:rustc-link-search=native={}" ,
4953 libdir. to_str( ) . unwrap( )
5054 ) ;
51- println ! (
52- "cargo:rustc-link-search=native={}" ,
53- libdir64. to_str( ) . unwrap( )
54- ) ;
5555 let mut debug_suffix = "" ;
5656 let libname = if target. contains ( "windows" ) && target. contains ( "msvc" ) {
5757 if env:: var ( "OPT_LEVEL" ) . unwrap ( ) == "0" {
You can’t perform that action at this time.
0 commit comments