From: Junyan He <junyan...@linux.intel.com>
Because we delete the validation of the PCH file, sometimes
the PCH in the system dir is not compatible with the clang
and cause crash.
Anytime, we need to use internal PCH when compiling.
Signed-off-by: Junyan He <junyan...@linux.intel.com>
---
backend/CMakeLists.txt | 2 +-
backend/src/CMakeLists.txt | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt
index 832eda8..edc5e62 100644
--- a/backend/CMakeLists.txt
+++ b/backend/CMakeLists.txt
@@ -107,6 +107,6 @@ set(LOCAL_GBE_OBJECT_DIR ${LOCAL_GBE_OBJECT_DIR}
PARENT_SCOPE)
set(LOCAL_INTERP_OBJECT_DIR ${LOCAL_INTERP_OBJECT_DIR} PARENT_SCOPE)
set (GBE_BIN_GENERATER
- OCL_BITCODE_BIN=${LOCAL_OCL_BITCODE_BIN}
OCL_HEADER_DIR=${LOCAL_OCL_HEADER_DIR} OCL_PCH_OBJECT=${LOCAL_OCL_PCH_OBJECT}
LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}/src
${CMAKE_CURRENT_BINARY_DIR}/src/gbe_bin_generater
+ OCL_BITCODE_LIB_PATH=${LOCAL_OCL_BITCODE_BIN}
OCL_HEADER_FILE_DIR=${LOCAL_OCL_HEADER_DIR}
OCL_PCH_PATH=${LOCAL_OCL_PCH_OBJECT}
LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}/src
${CMAKE_CURRENT_BINARY_DIR}/src/gbe_bin_generater
PARENT_SCOPE)
diff --git a/backend/src/CMakeLists.txt b/backend/src/CMakeLists.txt
index 1df8732..e57227a 100644
--- a/backend/src/CMakeLists.txt
+++ b/backend/src/CMakeLists.txt
@@ -1,6 +1,6 @@
-set (OCL_BITCODE_BIN
"${BEIGNET_INSTALL_DIR}beignet.bc:${CMAKE_CURRENT_BINARY_DIR}/libocl/lib/beignet.bc")
-set (OCL_HEADER_DIR
"${CMAKE_INSTALL_PREFIX}/include/CL/ocl/:${CMAKE_CURRENT_BINARY_DIR}/libocl/include/")
-set (OCL_PCH_OBJECT
"${BEIGNET_INSTALL_DIR}beignet.pch:${CMAKE_CURRENT_BINARY_DIR}/libocl/lib/beignet.pch")
+set (OCL_BITCODE_BIN "${BEIGNET_INSTALL_DIR}beignet.bc")
+set (OCL_HEADER_DIR "${CMAKE_INSTALL_PREFIX}/include/CL/ocl/")
+set (OCL_PCH_OBJECT "${BEIGNET_INSTALL_DIR}beignet.pch")
set (GBE_OBJECT_DIR "${BEIGNET_INSTALL_DIR}/libgbe.so")
set (INTERP_OBJECT_DIR "${BEIGNET_INSTALL_DIR}/libgbeinterp.so")
--
1.8.3.2
_______________________________________________
Beignet mailing list
Beignet@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/beignet
