diff options
| author | David Li <davidxli@google.com> | 2011-03-09 13:09:43 -0800 |
|---|---|---|
| committer | David Li <davidxli@google.com> | 2011-03-09 13:09:43 -0800 |
| commit | e1576cb670f27e197f9a0786897d0e9d1816469f (patch) | |
| tree | 942a05b6ecd394e0fcb86064918a93c6d6623b73 | |
| parent | ff98a1d6b0fb2fa5c1321ed2930003385e1b51c0 (diff) | |
Fix build problem for Mac by temporarily disabling host build.
Change-Id: I242e6988e50f7b4f915a19e00fd89b3d58515ffa
Signed-off-by: David Li <davidxli@google.com>
| -rw-r--r-- | Android.mk | 5 | ||||
| -rw-r--r-- | src/mesa/program/prog_parameter.cpp | 2 | ||||
| -rw-r--r-- | test/Android.mk | 5 |
3 files changed, 6 insertions, 6 deletions
@@ -149,8 +149,9 @@ endif LOCAL_C_INCLUDES := $(libMesa_C_INCLUDES) -include $(LLVM_ROOT_PATH)/llvm-host-build.mk -include $(BUILD_HOST_STATIC_LIBRARY) +# libMesa only builds on Linux host for now +#include $(LLVM_ROOT_PATH)/llvm-host-build.mk +#include $(BUILD_HOST_STATIC_LIBRARY) # Static library for target diff --git a/src/mesa/program/prog_parameter.cpp b/src/mesa/program/prog_parameter.cpp index f3526a9..d673d5f 100644 --- a/src/mesa/program/prog_parameter.cpp +++ b/src/mesa/program/prog_parameter.cpp @@ -1,6 +1,4 @@ // all allocations need to use hieralloc -typedef unsigned int size_t; - #include "prog_parameter.h" #include "src/glsl/ir.h" diff --git a/test/Android.mk b/test/Android.mk index da5dc6e..a2785dc 100644 --- a/test/Android.mk +++ b/test/Android.mk @@ -31,8 +31,9 @@ LOCAL_STATIC_LIBRARIES := libMesa LOCAL_SHARED_LIBRARIES := libbcc LOCAL_C_INCLUDES := $(mesa_C_INCLUDES) -include $(LLVM_ROOT_PATH)/llvm-host-build.mk -include $(BUILD_HOST_EXECUTABLE) +# libMesa only builds on Linux host for now +#include $(LLVM_ROOT_PATH)/llvm-host-build.mk +#include $(BUILD_HOST_EXECUTABLE) # Executable for target # ======================================================== |