commit 6fed67043e929679e1d6fa0cd13c636c1fd220c5
author Raphael <raphael@google.com> Thu Jan 13 15:30:15 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 13 15:30:15 2011 -0800
tree 601b4ea75c5235484857f439cb5ea3242618cdde
parent 5dee956d928e5fdf4ab1ad4b83460d00bc885a6e
parent 11e2b93b206dbb401077d1fa39b1bcdc6de4d986

Merge "Support for building/using llvm-rs-cc for Windows SDK." into honeycomb

Android.mk

diff --git a/Android.mk b/Android.mk
index adced9c..ec0a210 100644
--- a/Android.mk
+++ b/Android.mk
@@ -206,7 +206,11 @@
 LOCAL_STATIC_LIBRARIES :=	\
 	libclangDriver libslang
 
-LOCAL_LDLIBS := -ldl -lpthread
+ifeq ($(HOST_OS),windows)
+  LOCAL_LDLIBS := -limagehlp -lpsapi
+else
+  LOCAL_LDLIBS := -ldl -lpthread
+endif
 
 # For build RSCCOptions.inc from RSCCOptions.td
 intermediates := $(call local-intermediates-dir)

RSSpec.mk

diff --git a/RSSpec.mk b/RSSpec.mk
index 5a99b94..f617014 100644
--- a/RSSpec.mk
+++ b/RSSpec.mk
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 LOCAL_PATH := $(call my-dir)
-RS_SPEC_GEN := $(HOST_OUT_EXECUTABLES)/rs-spec-gen$(HOST_EXECUTABLE_SUFFIX)
+RS_SPEC_GEN := $(BUILD_OUT_EXECUTABLES)/rs-spec-gen$(BUILD_EXECUTABLE_SUFFIX)
 
 define generate-rs-spec-inc
 @mkdir -p $(dir $@)