diff options
| author | Tim Murray <timmurray@google.com> | 2014-07-24 22:08:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-23 18:56:15 +0000 |
| commit | 16d43086e91b76876f195b6d7a7c2e9d021b8293 (patch) | |
| tree | 785331c0a01d6ef69bcf3bc032a316f3d8ff6dd3 | |
| parent | f82de5b89d70fb0e122f03a3956c5b01e66daca5 (diff) | |
| parent | 5ca1dc15a1cb072442d2b1070e8b6cfa34b0a87a (diff) | |
| download | build-16d43086e91b76876f195b6d7a7c2e9d021b8293.tar.gz | |
Merge "Fix Windows SDK build to not use clang."
| -rw-r--r-- | core/binary.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/binary.mk b/core/binary.mk index ac7e14f7e8..5f0b043238 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -133,9 +133,11 @@ endif # clang is enabled by default for host builds # enable it unless we've specifically disabled clang above ifdef LOCAL_IS_HOST_MODULE -ifeq ($(my_clang),) - my_clang := true -endif + ifneq($(HOST_OS),windows) + ifeq ($(my_clang),) + my_clang := true + endif + endif endif # arch-specific static libraries go first so that generic ones can depend on them |