mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 21:17:20 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg] Fix build scripts on openSUSE and g++9 (#10867)

Browse Source 
The existing code did not correctly pass `CXX` to cmake.
This commit is contained in:
nicole mazzuca 2020-04-17 10:56:27 -07:00 committed by GitHub
parent b12256a4af
commit 12d75a13ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/bootstrap.sh
View File

@ -200,9 +200,7 @@ fetchTool()
selectCXX() selectCXX()
{ {
if [ "x$CXX" = "x" ]; then if [ "x$CXX" = "x" ]; then
if which g++ >/dev/null 2>&1; then if which g++-9 >/dev/null 2>&1; then
CXX=g++
elif which g++-9 >/dev/null 2>&1; then
CXX=g++-9 CXX=g++-9
elif which g++-8 >/dev/null 2>&1; then elif which g++-8 >/dev/null 2>&1; then
CXX=g++-8 CXX=g++-8
@ -210,6 +208,8 @@ selectCXX()
CXX=g++-7 CXX=g++-7
elif which g++-6 >/dev/null 2>&1; then elif which g++-6 >/dev/null 2>&1; then
CXX=g++-6 CXX=g++-6
elif which g++ >/dev/null 2>&1; then
CXX=g++
fi fi
# If we can't find g++, allow CMake to do the look-up # If we can't find g++, allow CMake to do the look-up
fi fi
@ -236,13 +236,12 @@ else
fi fi
# Do the build # Do the build
srcDir="$vcpkgRootDir/toolsrc" buildDir="$vcpkgRootDir/toolsrc/build.rel"
buildDir="$srcDir/build.rel"
rm -rf "$buildDir" rm -rf "$buildDir"
mkdir -p "$buildDir" mkdir -p "$buildDir"
("$cmakeExe" -B "$buildDir" -S "$srcDir" -DCMAKE_BUILD_TYPE=Release -G "Ninja" "-DCMAKE_MAKE_PROGRAM=$ninjaExe" "-DBUILD_TESTING=OFF" "-DVCPKG_DEVELOPMENT_WARNINGS=OFF" "-DVCPKG_WARNINGS_AS_ERRORS=OFF" "-DVCPKG_DISABLE_METRICS=$vcpkgDisableMetrics" "-DVCPKG_ALLOW_APPLE_CLANG=$vcpkgAllowAppleClang") || exit 1 (cd "$buildDir" && CXX="$CXX" "$cmakeExe" .. -DCMAKE_BUILD_TYPE=Release -G "Ninja" "-DCMAKE_MAKE_PROGRAM=$ninjaExe" "-DBUILD_TESTING=OFF" "-DVCPKG_DEVELOPMENT_WARNINGS=OFF" "-DVCPKG_DISABLE_METRICS=$vcpkgDisableMetrics" "-DVCPKG_ALLOW_APPLE_CLANG=$vcpkgAllowAppleClang") || exit 1
("$cmakeExe" --build "$buildDir") || exit 1 (cd "$buildDir" && "$cmakeExe" --build .) || exit 1
rm -rf "$vcpkgRootDir/vcpkg" rm -rf "$vcpkgRootDir/vcpkg"
cp "$buildDir/vcpkg" "$vcpkgRootDir/" cp "$buildDir/vcpkg" "$vcpkgRootDir/"

14
toolsrc/cmake/utilities.cmake
View File

@ -51,21 +51,21 @@ function(vcpkg_detect_standard_library)
check_cxx_source_compiles( check_cxx_source_compiles(
"#include <ciso646> "#include <ciso646>
#if !defined(__GLIBCXX__) #if !defined(__GLIBCXX__)
#error not libstdc++ #error \"not libstdc++\"
#endif #endif
int main() {}" int main() {}"
_VCPKG_STANDARD_LIBRARY_LIBSTDCXX) _VCPKG_STANDARD_LIBRARY_LIBSTDCXX)
check_cxx_source_compiles( check_cxx_source_compiles(
"#include <ciso646> "#include <ciso646>
#if !defined(_LIBCPP_VERSION) #if !defined(_LIBCPP_VERSION)
#error not libc++ #error \"not libc++\"
#endif #endif
int main() {}" int main() {}"
_VCPKG_STANDARD_LIBRARY_LIBCXX) _VCPKG_STANDARD_LIBRARY_LIBCXX)
check_cxx_source_compiles( check_cxx_source_compiles(
"#include <ciso646> "#include <ciso646>
#if !defined(_MSVC_STL_VERSION) #if !defined(_MSVC_STL_VERSION)
#error not MSVC stl #error \"not MSVC stl\"
#endif #endif
int main() {}" int main() {}"
_VCPKG_STANDARD_LIBRARY_MSVC_STL) _VCPKG_STANDARD_LIBRARY_MSVC_STL)
@ -101,7 +101,7 @@ function(vcpkg_detect_std_filesystem)
check_cxx_source_compiles( check_cxx_source_compiles(
"#include <ciso646> "#include <ciso646>
#if defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE >= 9 #if defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE >= 9
#error libstdc++ after version 9 does not require -lstdc++fs #error \"libstdc++ after version 9 does not require -lstdc++fs\"
#endif #endif
int main() {}" int main() {}"
_VCPKG_REQUIRE_LINK_CXXFS) _VCPKG_REQUIRE_LINK_CXXFS)
@ -109,7 +109,7 @@ function(vcpkg_detect_std_filesystem)
check_cxx_source_compiles( check_cxx_source_compiles(
"#include <ciso646> "#include <ciso646>
#if !defined(_GLIBCXX_RELEASE) || _GLIBCXX_RELEASE < 8 #if !defined(_GLIBCXX_RELEASE) || _GLIBCXX_RELEASE < 8
#error libstdc++ before version 8 doesn't support <filesystem> #error \"libstdc++ before version 8 does not support <filesystem>\"
#endif #endif
int main() {}" int main() {}"
_VCPKG_USE_STD_FILESYSTEM) _VCPKG_USE_STD_FILESYSTEM)
@ -121,7 +121,7 @@ function(vcpkg_detect_std_filesystem)
check_cxx_source_compiles( check_cxx_source_compiles(
"#include <ciso646> "#include <ciso646>
#if _LIBCPP_VERSION >= 9000 #if _LIBCPP_VERSION >= 9000
#error libc++ after version 9 does not require -lc++fs #error \"libc++ after version 9 does not require -lc++fs\"
#endif #endif
int main() {}" int main() {}"
_VCPKG_REQUIRE_LINK_CXXFS) _VCPKG_REQUIRE_LINK_CXXFS)
@ -133,7 +133,7 @@ function(vcpkg_detect_std_filesystem)
check_cxx_source_compiles( check_cxx_source_compiles(
"#include <ciso646> "#include <ciso646>
#if !defined(_MSVC_STL_UPDATE) || _MSVC_STL_UPDATE < 201803 #if !defined(_MSVC_STL_UPDATE) || _MSVC_STL_UPDATE < 201803
#error MSVC STL before 15.7 doesn't support <filesystem> #error \"MSVC STL before 15.7 does not support <filesystem>\"
#endif #endif
int main() {}" int main() {}"
_VCPKG_USE_STD_FILESYSTEM) _VCPKG_USE_STD_FILESYSTEM)