Skip to content

Commit f384b05

Browse files
committed
Use BROTLI_DIR
1 parent 971f6ea commit f384b05

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed

utils/build.ps1

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2438,8 +2438,7 @@ function Build-CURL([Hashtable] $Platform) {
24382438
USE_WIN32_LDAP = "NO";
24392439
ZLIB_ROOT = "$BinaryCache\$($Platform.Triple)\usr";
24402440
ZLIB_LIBRARY = "$BinaryCache\$($Platform.Triple)\usr\lib\zlibstatic.lib";
2441-
BROTLIDEC_LIBRARY = "$BinaryCache\$($Platform.Triple)\usr\lib\brotlidec.lib"
2442-
BROTLICOMMON_LIBRARY = "$BinaryCache\$($Platform.Triple)\usr\lib\brotlicommon.lib"
2441+
BROTLI_DIR = "$BinaryCache\$($Platform.Triple)\usr";
24432442
})
24442443
}
24452444

@@ -2853,17 +2852,7 @@ function Build-Foundation {
28532852
"$BinaryCache\$($Platform.Triple)\usr\lib\libz.a"
28542853
};
28552854
ZLIB_INCLUDE_DIR = "$BinaryCache\$($Platform.Triple)\usr\include";
2856-
BROTLIDEC_LIBRARY = if ($Platform.OS -eq [OS]::Windows) {
2857-
"$BinaryCache\$($Platform.Triple)\usr\lib\brotlidec.lib"
2858-
} else {
2859-
"$BinaryCache\$($Platform.Triple)\usr\lib64\brotlidec.a"
2860-
}
2861-
BROTLICOMMON_LIBRARY = if ($Platform.OS -eq [OS]::Windows) {
2862-
"$BinaryCache\$($Platform.Triple)\usr\lib\brotlicommon.lib"
2863-
}else {
2864-
"$BinaryCache\$($Platform.Triple)\usr\lib64\brotlicommon.a"
2865-
}
2866-
DBROTLI_INCLUDE_DIR = "$BinaryCache\$($Platform.Triple)\usr\include";
2855+
BROTLI_DIR = "$BinaryCache\$($Platform.Triple)\usr";
28672856
dispatch_DIR = $DispatchCMakeModules;
28682857
SwiftSyntax_DIR = (Get-ProjectBinaryCache $HostPlatform Compilers);
28692858
_SwiftFoundation_SourceDIR = "$SourceCache\swift-foundation";

0 commit comments

Comments
 (0)