diff options
author | Vincent Ambo <mail@tazj.in> | 2022-02-07T19·15+0300 |
---|---|---|
committer | tazjin <tazjin@tvl.su> | 2022-02-07T22·25+0000 |
commit | 5ed7ef8089a6914a81b7592d2b6db93c5d87a1e2 (patch) | |
tree | d1b86294fd613ed62f131a4ba67bc6e3adf2fc61 /third_party/glog/toolchains | |
parent | 18c8c41b5c2de5a08530b5185cefef86f6ffaff5 (diff) |
chore(3p/glog): Unvendor glog r/3784
... and build //third_party/nix with the one from nixpkgs. Change-Id: Iae7f1772a31286f2c22955cdc1fe61ee82d112aa Reviewed-on: https://cl.tvl.fyi/c/depot/+/3016 Tested-by: BuildkiteCI Autosubmit: tazjin <tazjin@tvl.su> Reviewed-by: grfn <grfn@gws.fyi>
Diffstat (limited to 'third_party/glog/toolchains')
-rw-r--r-- | third_party/glog/toolchains/.gitignore | 2 | ||||
-rw-r--r-- | third_party/glog/toolchains/clang-cxx17.cmake | 13 | ||||
-rw-r--r-- | third_party/glog/toolchains/gcc-cxx11.cmake | 13 | ||||
-rw-r--r-- | third_party/glog/toolchains/gcc-cxx17.cmake | 13 | ||||
-rw-r--r-- | third_party/glog/toolchains/gcc-cxx98.cmake | 13 | ||||
-rw-r--r-- | third_party/glog/toolchains/gcc-gnuxx11.cmake | 13 | ||||
-rw-r--r-- | third_party/glog/toolchains/linux-mingw-w64-cxx11.cmake | 33 | ||||
-rw-r--r-- | third_party/glog/toolchains/linux-mingw-w64-cxx17.cmake | 33 | ||||
-rw-r--r-- | third_party/glog/toolchains/linux-mingw-w64-gnuxx11.cmake | 33 | ||||
-rw-r--r-- | third_party/glog/toolchains/mingw-cxx11.cmake | 13 | ||||
-rw-r--r-- | third_party/glog/toolchains/mingw-cxx17.cmake | 13 | ||||
-rw-r--r-- | third_party/glog/toolchains/mingw-gnuxx11.cmake | 13 | ||||
-rw-r--r-- | third_party/glog/toolchains/vs-14-2015-sdk-8-1.cmake | 2 | ||||
-rw-r--r-- | third_party/glog/toolchains/vs-14-2015-win64.cmake | 1 | ||||
-rw-r--r-- | third_party/glog/toolchains/vs-15-2017-win64-cxx17.cmake | 2 | ||||
-rw-r--r-- | third_party/glog/toolchains/vs-15-2017-win64.cmake | 1 |
16 files changed, 0 insertions, 211 deletions
diff --git a/third_party/glog/toolchains/.gitignore b/third_party/glog/toolchains/.gitignore deleted file mode 100644 index 13489ce3b5db..000000000000 --- a/third_party/glog/toolchains/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# allow toolchain files to be tracked by git -!*.cmake diff --git a/third_party/glog/toolchains/clang-cxx17.cmake b/third_party/glog/toolchains/clang-cxx17.cmake deleted file mode 100644 index 09d077a38d7c..000000000000 --- a/third_party/glog/toolchains/clang-cxx17.cmake +++ /dev/null @@ -1,13 +0,0 @@ -# Sample toolchain file for building with gcc compiler -# -# Typical usage: -# *) cmake -H. -B_build -DCMAKE_TOOLCHAIN_FILE="${PWD}/toolchains/gcc.cmake" - -# set compiler -set(CMAKE_C_COMPILER clang) -set(CMAKE_CXX_COMPILER clang++) - -# set c++ standard -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_CXX_EXTENSIONS OFF) diff --git a/third_party/glog/toolchains/gcc-cxx11.cmake b/third_party/glog/toolchains/gcc-cxx11.cmake deleted file mode 100644 index da1ab5778a27..000000000000 --- a/third_party/glog/toolchains/gcc-cxx11.cmake +++ /dev/null @@ -1,13 +0,0 @@ -# Sample toolchain file for building with gcc compiler -# -# Typical usage: -# *) cmake -H. -B_build -DCMAKE_TOOLCHAIN_FILE="${PWD}/toolchains/gcc.cmake" - -# set compiler -set(CMAKE_C_COMPILER gcc) -set(CMAKE_CXX_COMPILER g++) - -# set c++ standard -set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_CXX_EXTENSIONS OFF) diff --git a/third_party/glog/toolchains/gcc-cxx17.cmake b/third_party/glog/toolchains/gcc-cxx17.cmake deleted file mode 100644 index 1b834f12015b..000000000000 --- a/third_party/glog/toolchains/gcc-cxx17.cmake +++ /dev/null @@ -1,13 +0,0 @@ -# Sample toolchain file for building with gcc compiler -# -# Typical usage: -# *) cmake -H. -B_build -DCMAKE_TOOLCHAIN_FILE="${PWD}/toolchains/gcc.cmake" - -# set compiler -set(CMAKE_C_COMPILER gcc) -set(CMAKE_CXX_COMPILER g++) - -# set c++ standard -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_CXX_EXTENSIONS OFF) diff --git a/third_party/glog/toolchains/gcc-cxx98.cmake b/third_party/glog/toolchains/gcc-cxx98.cmake deleted file mode 100644 index 5697ab252aae..000000000000 --- a/third_party/glog/toolchains/gcc-cxx98.cmake +++ /dev/null @@ -1,13 +0,0 @@ -# Sample toolchain file for building with gcc compiler -# -# Typical usage: -# *) cmake -H. -B_build -DCMAKE_TOOLCHAIN_FILE="${PWD}/toolchains/gcc.cmake" - -# set compiler -set(CMAKE_C_COMPILER gcc) -set(CMAKE_CXX_COMPILER g++) - -# set c++ standard -set(CMAKE_CXX_STANDARD 98) -set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_CXX_EXTENSIONS OFF) diff --git a/third_party/glog/toolchains/gcc-gnuxx11.cmake b/third_party/glog/toolchains/gcc-gnuxx11.cmake deleted file mode 100644 index 91f0e4a3ce76..000000000000 --- a/third_party/glog/toolchains/gcc-gnuxx11.cmake +++ /dev/null @@ -1,13 +0,0 @@ -# Sample toolchain file for building with gcc compiler -# -# Typical usage: -# *) cmake -H. -B_build -DCMAKE_TOOLCHAIN_FILE="${PWD}/toolchains/gcc.cmake" - -# set compiler -set(CMAKE_C_COMPILER gcc) -set(CMAKE_CXX_COMPILER g++) - -# set c++ standard -set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_CXX_EXTENSIONS ON) diff --git a/third_party/glog/toolchains/linux-mingw-w64-cxx11.cmake b/third_party/glog/toolchains/linux-mingw-w64-cxx11.cmake deleted file mode 100644 index 9c6e126a68d2..000000000000 --- a/third_party/glog/toolchains/linux-mingw-w64-cxx11.cmake +++ /dev/null @@ -1,33 +0,0 @@ -# Sample toolchain file for building for Windows from an Ubuntu Linux system. -# -# Typical usage: -# *) install cross compiler: `sudo apt-get install mingw-w64` -# *) cmake -H. -B_build_mingw -DCMAKE_TOOLCHAIN_FILE="${PWD}/toolchains/linux-mingw-w64.cmake" - -set(CMAKE_SYSTEM_NAME Windows) -set(CMAKE_SYSTEM_PROCESSOR x86_64) -set(TOOLCHAIN_PREFIX x86_64-w64-mingw32) - -# set compiler -set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc) -set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++) -set(CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres) - -# target environment on the build host system -# set 1st to dir with the cross compiler's C/C++ headers/libs -set(CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX}) - -# modify default behavior of FIND_XXX() commands to -# search for headers/libs in the target environment and -# search for programs in the build host environment -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) - -# use emulator for `try_run` calls -set(CMAKE_CROSSCOMPILING_EMULATOR wine64) - -# set c++ standard -set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_CXX_EXTENSIONS OFF) diff --git a/third_party/glog/toolchains/linux-mingw-w64-cxx17.cmake b/third_party/glog/toolchains/linux-mingw-w64-cxx17.cmake deleted file mode 100644 index 1c363f10eb10..000000000000 --- a/third_party/glog/toolchains/linux-mingw-w64-cxx17.cmake +++ /dev/null @@ -1,33 +0,0 @@ -# Sample toolchain file for building for Windows from an Ubuntu Linux system. -# -# Typical usage: -# *) install cross compiler: `sudo apt-get install mingw-w64` -# *) cmake -H. -B_build_mingw -DCMAKE_TOOLCHAIN_FILE="${PWD}/toolchains/linux-mingw-w64.cmake" - -set(CMAKE_SYSTEM_NAME Windows) -set(CMAKE_SYSTEM_PROCESSOR x86_64) -set(TOOLCHAIN_PREFIX x86_64-w64-mingw32) - -# set compiler -set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc) -set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++) -set(CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres) - -# target environment on the build host system -# set 1st to dir with the cross compiler's C/C++ headers/libs -set(CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX}) - -# modify default behavior of FIND_XXX() commands to -# search for headers/libs in the target environment and -# search for programs in the build host environment -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) - -# use emulator for `try_run` calls -set(CMAKE_CROSSCOMPILING_EMULATOR wine64) - -# set c++ standard -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_CXX_EXTENSIONS OFF) diff --git a/third_party/glog/toolchains/linux-mingw-w64-gnuxx11.cmake b/third_party/glog/toolchains/linux-mingw-w64-gnuxx11.cmake deleted file mode 100644 index 99029649dfa3..000000000000 --- a/third_party/glog/toolchains/linux-mingw-w64-gnuxx11.cmake +++ /dev/null @@ -1,33 +0,0 @@ -# Sample toolchain file for building for Windows from an Ubuntu Linux system. -# -# Typical usage: -# *) install cross compiler: `sudo apt-get install mingw-w64` -# *) cmake -H. -B_build_mingw -DCMAKE_TOOLCHAIN_FILE="${PWD}/toolchains/linux-mingw-w64.cmake" - -set(CMAKE_SYSTEM_NAME Windows) -set(CMAKE_SYSTEM_PROCESSOR x86_64) -set(TOOLCHAIN_PREFIX x86_64-w64-mingw32) - -# set compiler -set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc) -set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++) -set(CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres) - -# target environment on the build host system -# set 1st to dir with the cross compiler's C/C++ headers/libs -set(CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX}) - -# modify default behavior of FIND_XXX() commands to -# search for headers/libs in the target environment and -# search for programs in the build host environment -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) - -# use emulator for `try_run` calls -set(CMAKE_CROSSCOMPILING_EMULATOR wine64) - -# set c++ standard -set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_CXX_EXTENSIONS ON) diff --git a/third_party/glog/toolchains/mingw-cxx11.cmake b/third_party/glog/toolchains/mingw-cxx11.cmake deleted file mode 100644 index 873f623f6011..000000000000 --- a/third_party/glog/toolchains/mingw-cxx11.cmake +++ /dev/null @@ -1,13 +0,0 @@ -# Sample toolchain file for building with gcc compiler -# -# Typical usage: -# *) cmake -H. -B_build -DCMAKE_TOOLCHAIN_FILE="%cd%\toolchains\mingw.cmake" - -# set compiler -set(CMAKE_C_COMPILER gcc) -set(CMAKE_CXX_COMPILER g++) - -# set c++ standard -set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_CXX_EXTENSIONS OFF) diff --git a/third_party/glog/toolchains/mingw-cxx17.cmake b/third_party/glog/toolchains/mingw-cxx17.cmake deleted file mode 100644 index c0c89cc459f4..000000000000 --- a/third_party/glog/toolchains/mingw-cxx17.cmake +++ /dev/null @@ -1,13 +0,0 @@ -# Sample toolchain file for building with gcc compiler -# -# Typical usage: -# *) cmake -H. -B_build -DCMAKE_TOOLCHAIN_FILE="%cd%\toolchains\mingw.cmake" - -# set compiler -set(CMAKE_C_COMPILER gcc) -set(CMAKE_CXX_COMPILER g++) - -# set c++ standard -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_CXX_EXTENSIONS OFF) diff --git a/third_party/glog/toolchains/mingw-gnuxx11.cmake b/third_party/glog/toolchains/mingw-gnuxx11.cmake deleted file mode 100644 index 66337050c92f..000000000000 --- a/third_party/glog/toolchains/mingw-gnuxx11.cmake +++ /dev/null @@ -1,13 +0,0 @@ -# Sample toolchain file for building with gcc compiler -# -# Typical usage: -# *) cmake -H. -B_build -DCMAKE_TOOLCHAIN_FILE="%cd%\toolchains\mingw.cmake" - -# set compiler -set(CMAKE_C_COMPILER gcc) -set(CMAKE_CXX_COMPILER g++) - -# set c++ standard -set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_CXX_EXTENSIONS YES) diff --git a/third_party/glog/toolchains/vs-14-2015-sdk-8-1.cmake b/third_party/glog/toolchains/vs-14-2015-sdk-8-1.cmake deleted file mode 100644 index 463bee052386..000000000000 --- a/third_party/glog/toolchains/vs-14-2015-sdk-8-1.cmake +++ /dev/null @@ -1,2 +0,0 @@ -# set c++ standard -set(CMAKE_SYSTEM_VERSION 8.1) diff --git a/third_party/glog/toolchains/vs-14-2015-win64.cmake b/third_party/glog/toolchains/vs-14-2015-win64.cmake deleted file mode 100644 index 00beda25efd4..000000000000 --- a/third_party/glog/toolchains/vs-14-2015-win64.cmake +++ /dev/null @@ -1 +0,0 @@ -# dummy, nothing extra to set diff --git a/third_party/glog/toolchains/vs-15-2017-win64-cxx17.cmake b/third_party/glog/toolchains/vs-15-2017-win64-cxx17.cmake deleted file mode 100644 index 5e4e936872d9..000000000000 --- a/third_party/glog/toolchains/vs-15-2017-win64-cxx17.cmake +++ /dev/null @@ -1,2 +0,0 @@ -# set c++ standard -set(CMAKE_CXX_FLAGS_INIT "${CMAKE_CXX_FLAGS_INIT} /std:c++17") diff --git a/third_party/glog/toolchains/vs-15-2017-win64.cmake b/third_party/glog/toolchains/vs-15-2017-win64.cmake deleted file mode 100644 index 00beda25efd4..000000000000 --- a/third_party/glog/toolchains/vs-15-2017-win64.cmake +++ /dev/null @@ -1 +0,0 @@ -# dummy, nothing extra to set |