Skip to content

Commit 11fa0bc

Browse files
committed
Use BROTLI_DIR
1 parent e913d67 commit 11fa0bc

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
@@ -2350,8 +2350,7 @@ function Build-CURL([Hashtable] $Platform) {
23502350
USE_WIN32_LDAP = "NO";
23512351
ZLIB_ROOT = "$BinaryCache\$($Platform.Triple)\usr";
23522352
ZLIB_LIBRARY = "$BinaryCache\$($Platform.Triple)\usr\lib\zlibstatic.lib";
2353-
BROTLIDEC_LIBRARY = "$BinaryCache\$($Platform.Triple)\usr\lib\brotlidec.lib"
2354-
BROTLICOMMON_LIBRARY = "$BinaryCache\$($Platform.Triple)\usr\lib\brotlicommon.lib"
2353+
BROTLI_DIR = "$BinaryCache\$($Platform.Triple)\usr";
23552354
})
23562355
}
23572356

@@ -2741,17 +2740,7 @@ function Build-Foundation {
27412740
"$BinaryCache\$($Platform.Triple)\usr\lib\libz.a"
27422741
};
27432742
ZLIB_INCLUDE_DIR = "$BinaryCache\$($Platform.Triple)\usr\include";
2744-
BROTLIDEC_LIBRARY = if ($Platform.OS -eq [OS]::Windows) {
2745-
"$BinaryCache\$($Platform.Triple)\usr\lib\brotlidec.lib"
2746-
} else {
2747-
"$BinaryCache\$($Platform.Triple)\usr\lib64\brotlidec.a"
2748-
}
2749-
BROTLICOMMON_LIBRARY = if ($Platform.OS -eq [OS]::Windows) {
2750-
"$BinaryCache\$($Platform.Triple)\usr\lib\brotlicommon.lib"
2751-
}else {
2752-
"$BinaryCache\$($Platform.Triple)\usr\lib64\brotlicommon.a"
2753-
}
2754-
DBROTLI_INCLUDE_DIR = "$BinaryCache\$($Platform.Triple)\usr\include";
2743+
BROTLI_DIR = "$BinaryCache\$($Platform.Triple)\usr";
27552744
dispatch_DIR = $DispatchCMakeModules;
27562745
SwiftSyntax_DIR = (Get-ProjectBinaryCache $HostPlatform Compilers);
27572746
_SwiftFoundation_SourceDIR = "$SourceCache\swift-foundation";

0 commit comments

Comments
 (0)