Regenerate artifacts.

libbitcoin · Nov 21, 2022 · 19bfef5 · 19bfef5
1 parent 34d4ec1
commit 19bfef5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/builds/msvc/vs2022/libbitcoin-consensus-test/libbitcoin-consensus-test.vcxproj b/builds/msvc/vs2022/libbitcoin-consensus-test/libbitcoin-consensus-test.vcxproj
@@ -63,6 +63,9 @@
     </ProjectConfiguration>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup>
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />

diff --git a/builds/msvc/vs2022/libbitcoin-consensus/libbitcoin-consensus.vcxproj b/builds/msvc/vs2022/libbitcoin-consensus/libbitcoin-consensus.vcxproj
@@ -66,6 +66,9 @@
     <ConfigurationType Condition="$(Configuration.IndexOf('DLL')) != -1">DynamicLibrary</ConfigurationType>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup>
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />

diff --git a/install-cmake.sh b/install-cmake.sh
@@ -293,7 +293,7 @@ set_os_specific_compiler_settings()
 
 link_to_standard_library()
 {
-    if [[ ($OS == Linux && $CC == "clang") || ($OS == OpenBSD) ]]; then
+    if [[ ($OS == Linux && $CC == clang*) || ($OS == OpenBSD) ]]; then
         export LDLIBS="-l$STDLIB $LDLIBS"
         export CXXFLAGS="-stdlib=lib$STDLIB $CXXFLAGS"
     fi
@@ -728,7 +728,7 @@ initialize_boost_configuration()
         BOOST_TOOLSET="toolset=$CC"
     fi
 
-    if [[ ($OS == Linux && $CC == "clang") || ($OS == OpenBSD) ]]; then
+    if [[ ($OS == Linux && $CC == clang*) || ($OS == OpenBSD) ]]; then
         STDLIB_FLAG="-stdlib=lib$STDLIB"
         BOOST_CXXFLAGS="cxxflags=$STDLIB_FLAG"
         BOOST_LINKFLAGS="linkflags=$STDLIB_FLAG"

diff --git a/install.sh b/install.sh
@@ -288,7 +288,7 @@ set_os_specific_compiler_settings()
 
 link_to_standard_library()
 {
-    if [[ ($OS == Linux && $CC == "clang") || ($OS == OpenBSD) ]]; then
+    if [[ ($OS == Linux && $CC == clang*) || ($OS == OpenBSD) ]]; then
         export LDLIBS="-l$STDLIB $LDLIBS"
         export CXXFLAGS="-stdlib=lib$STDLIB $CXXFLAGS"
     fi
@@ -608,7 +608,7 @@ initialize_boost_configuration()
         BOOST_TOOLSET="toolset=$CC"
     fi
 
-    if [[ ($OS == Linux && $CC == "clang") || ($OS == OpenBSD) ]]; then
+    if [[ ($OS == Linux && $CC == clang*) || ($OS == OpenBSD) ]]; then
         STDLIB_FLAG="-stdlib=lib$STDLIB"
         BOOST_CXXFLAGS="cxxflags=$STDLIB_FLAG"
         BOOST_LINKFLAGS="linkflags=$STDLIB_FLAG"