diff options
| author | İsmail Dönmez <ismail@users.noreply.github.com> | 2019-06-13 01:30:03 +0200 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2019-06-12 16:30:03 -0700 |
| commit | 8c49e565c0eb565fd76df76144dd78d70a211d6e (patch) | |
| tree | 2a002c9389754349ee39852b8417a7637c7a0243 | |
| parent | 70149722d758c21b5f49a22f3a4a0c15ea8c6852 (diff) | |
| download | vcpkg-8c49e565c0eb565fd76df76144dd78d70a211d6e.tar.gz vcpkg-8c49e565c0eb565fd76df76144dd78d70a211d6e.zip | |
Protect #pragma comment(lib, "foo") with _WIN32 checks (#6867)
lld on Linux can now process #pragma comment(lib, "foo") macros which
results in build failures on Linux when lld is used. Fix this by
protecting these macros with _WIN32 checks.
| -rw-r--r-- | toolsrc/src/tests.arguments.cpp | 4 | ||||
| -rw-r--r-- | toolsrc/src/tests.dependencies.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/tests.packagespec.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/tests.paragraph.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg/base/system.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg/metrics.cpp | 2 |
7 files changed, 15 insertions, 1 deletions
diff --git a/toolsrc/src/tests.arguments.cpp b/toolsrc/src/tests.arguments.cpp index 72bdbdb65..51ababd3d 100644 --- a/toolsrc/src/tests.arguments.cpp +++ b/toolsrc/src/tests.arguments.cpp @@ -1,7 +1,9 @@ #include "tests.pch.h"
+#if defined(_WIN32)
#pragma comment(lib, "version")
#pragma comment(lib, "winhttp")
+#endif
using namespace Microsoft::VisualStudio::CppUnitTestFramework;
@@ -61,4 +63,4 @@ namespace UnitTest1 Assert::AreEqual(size_t{0}, v.command_arguments.size());
}
};
-}
\ No newline at end of file +}
diff --git a/toolsrc/src/tests.dependencies.cpp b/toolsrc/src/tests.dependencies.cpp index f82fad4e4..7d8283ed6 100644 --- a/toolsrc/src/tests.dependencies.cpp +++ b/toolsrc/src/tests.dependencies.cpp @@ -1,7 +1,9 @@ #include "tests.pch.h" +#if defined(_WIN32) #pragma comment(lib, "version") #pragma comment(lib, "winhttp") +#endif using namespace Microsoft::VisualStudio::CppUnitTestFramework; diff --git a/toolsrc/src/tests.packagespec.cpp b/toolsrc/src/tests.packagespec.cpp index 32ad81227..d3bc18c79 100644 --- a/toolsrc/src/tests.packagespec.cpp +++ b/toolsrc/src/tests.packagespec.cpp @@ -2,8 +2,10 @@ #include <tests.utils.h> +#if defined(_WIN32) #pragma comment(lib, "version") #pragma comment(lib, "winhttp") +#endif using namespace Microsoft::VisualStudio::CppUnitTestFramework; diff --git a/toolsrc/src/tests.paragraph.cpp b/toolsrc/src/tests.paragraph.cpp index 9a56ad9ee..e99d07694 100644 --- a/toolsrc/src/tests.paragraph.cpp +++ b/toolsrc/src/tests.paragraph.cpp @@ -1,7 +1,9 @@ #include "tests.pch.h" +#if defined(_WIN32) #pragma comment(lib, "version") #pragma comment(lib, "winhttp") +#endif using namespace Microsoft::VisualStudio::CppUnitTestFramework; diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp index ab7586eeb..e02bdc71f 100644 --- a/toolsrc/src/vcpkg.cpp +++ b/toolsrc/src/vcpkg.cpp @@ -40,8 +40,10 @@ #include <memory> #include <random> +#if defined(_WIN32) #pragma comment(lib, "ole32") #pragma comment(lib, "shell32") +#endif using namespace vcpkg; diff --git a/toolsrc/src/vcpkg/base/system.cpp b/toolsrc/src/vcpkg/base/system.cpp index a11853524..3d89d2fd4 100644 --- a/toolsrc/src/vcpkg/base/system.cpp +++ b/toolsrc/src/vcpkg/base/system.cpp @@ -16,7 +16,9 @@ #include <sys/sysctl.h> #endif +#if defined(_WIN32) #pragma comment(lib, "Advapi32") +#endif using namespace vcpkg::System; diff --git a/toolsrc/src/vcpkg/metrics.cpp b/toolsrc/src/vcpkg/metrics.cpp index 5ca2b056a..9dd520ed6 100644 --- a/toolsrc/src/vcpkg/metrics.cpp +++ b/toolsrc/src/vcpkg/metrics.cpp @@ -9,8 +9,10 @@ #include <vcpkg/base/strings.h> #include <vcpkg/base/system.process.h> +#if defined(_WIN32) #pragma comment(lib, "version") #pragma comment(lib, "winhttp") +#endif namespace vcpkg::Metrics { |