diff options
| author | 肥猫零零七 <silverviolin@outlook.com> | 2020-11-26 04:09:32 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-25 12:09:32 -0800 |
| commit | d611b06c4852cc8b02fd98f33f6d8ea2ac6b1ece (patch) | |
| tree | 1164ea24ac27407a8ab8b1deee5667461795e10f /toolsrc/src | |
| parent | e2ec3b25e372041a1be75065c7f9cb421a155d0a (diff) | |
| download | vcpkg-d611b06c4852cc8b02fd98f33f6d8ea2ac6b1ece.tar.gz vcpkg-d611b06c4852cc8b02fd98f33f6d8ea2ac6b1ece.zip | |
[vcpkg] Fix redefinition for OVERLAY_TRIPLETS_ENV (#14744)
* Update vcpkgcmdarguments.cpp
Fix the bug for master branch, the var of OVERLAY_TRIPLETS_ENV be defined two times (the lines of 923 and 925 )
[69/83] Building CXX object CMakeFiles/vcpkglib.dir/src/vcpkg/vcpkgcmdarguments.cpp.o
FAILED: CMakeFiles/vcpkglib.dir/src/vcpkg/vcpkgcmdarguments.cpp.o
/usr/local/bin/g++-6 -DVCPKG_USE_STD_FILESYSTEM=0 -I../include -O3 -DNDEBUG -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX10.14.sdk -include /Users/lizhipeng/develop/project/git_project/opensource/c++/vcpkg/toolsrc/include/pch.h -std=c++1z -MD -MT CMakeFiles/vcpkglib.dir/src/vcpkg/vcpkgcmdarguments.cpp.o -MF CMakeFiles/vcpkglib.dir/src/vcpkg/vcpkgcmdarguments.cpp.o.d -o CMakeFiles/vcpkglib.dir/src/vcpkg/vcpkgcmdarguments.cpp.o -c ../src/vcpkg/vcpkgcmdarguments.cpp
../src/vcpkg/vcpkgcmdarguments.cpp:925:48: error: redefinition of 'constexpr const vcpkg::StringLiteral vcpkg::VcpkgCmdArguments::OVERLAY_TRIPLETS_ENV'
constexpr StringLiteral VcpkgCmdArguments::OVERLAY_TRIPLETS_ENV;
^~~~~~~~~~~~~~~~~~~~
In file included from ../src/vcpkg/vcpkgcmdarguments.cpp:9:0:
../include/vcpkg/vcpkgcmdarguments.h:145:40: note: 'constexpr const vcpkg::StringLiteral vcpkg::VcpkgCmdArguments::OVERLAY_TRIPLETS_ENV' previously defined here
constexpr static StringLiteral OVERLAY_TRIPLETS_ENV = "VCPKG_OVERLAY_TRIPLETS";
* Update toolsrc/src/vcpkg/vcpkgcmdarguments.cpp
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Diffstat (limited to 'toolsrc/src')
| -rw-r--r-- | toolsrc/src/vcpkg/vcpkgcmdarguments.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp b/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp index ec4eef3a8..d6634985e 100644 --- a/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp +++ b/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp @@ -922,7 +922,6 @@ namespace vcpkg constexpr StringLiteral VcpkgCmdArguments::OVERLAY_PORTS_ARG; constexpr StringLiteral VcpkgCmdArguments::OVERLAY_TRIPLETS_ENV; constexpr StringLiteral VcpkgCmdArguments::OVERLAY_TRIPLETS_ARG; - constexpr StringLiteral VcpkgCmdArguments::OVERLAY_TRIPLETS_ENV; constexpr StringLiteral VcpkgCmdArguments::BINARY_SOURCES_ARG; |