diff options
| author | Johannes Obermayr <[email protected]> | 2012-11-30 01:44:56 +0100 |
|---|---|---|
| committer | Tom Stellard <[email protected]> | 2013-01-08 20:32:47 -0500 |
| commit | 959e83d65075513f989cb1fe634dca314a7e185f (patch) | |
| tree | d04d3e1f2df67eb1889a2ff0030705beaaab3c42 /src/gallium/state_trackers/clover | |
| parent | ed3f237e09a42bdb55afb58d1536affad9000d76 (diff) | |
clover: Adapt libclc's INCLUDEDIR and LIBEXECDIR to make use of the new introduced libclc.pc.
Tom Stellard:
-Keep --with-libclc-path and mark it deprecated.
Reviewed-by: Tom Stellard <[email protected]>
Diffstat (limited to 'src/gallium/state_trackers/clover')
| -rw-r--r-- | src/gallium/state_trackers/clover/Makefile.am | 3 | ||||
| -rw-r--r-- | src/gallium/state_trackers/clover/llvm/invocation.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/gallium/state_trackers/clover/Makefile.am b/src/gallium/state_trackers/clover/Makefile.am index ee69f893272..863d1365a1d 100644 --- a/src/gallium/state_trackers/clover/Makefile.am +++ b/src/gallium/state_trackers/clover/Makefile.am @@ -23,7 +23,8 @@ libclllvm_la_CXXFLAGS = \ -std=c++98 \ $(LLVM_CPPFLAGS) \ $(DEFINES) \ - -DLIBCLC_PATH=\"$(LIBCLC_PATH)/\" \ + -DLIBCLC_INCLUDEDIR=\"$(LIBCLC_INCLUDEDIR)/\" \ + -DLIBCLC_LIBEXECDIR=\"$(LIBCLC_LIBEXECDIR)/\" \ -DCLANG_RESOURCE_DIR=\"$(CLANG_RESOURCE_DIR)\" libclllvm_la_SOURCES = \ diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp b/src/gallium/state_trackers/clover/llvm/invocation.cpp index c9973679a4c..0bd8e22f8eb 100644 --- a/src/gallium/state_trackers/clover/llvm/invocation.cpp +++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp @@ -149,7 +149,7 @@ namespace { c.getHeaderSearchOpts().ResourceDir = CLANG_RESOURCE_DIR; // Add libclc generic search path - c.getHeaderSearchOpts().AddPath(LIBCLC_PATH "/generic/include/", + c.getHeaderSearchOpts().AddPath(LIBCLC_INCLUDEDIR, clang::frontend::Angled, false, false, false); @@ -205,7 +205,7 @@ namespace { llvm::Linker linker("clover", mod); // Link the kernel with libclc - linker.LinkInFile(llvm::sys::Path(LIBCLC_PATH + triple + "/lib/builtins.bc"), isNative); + linker.LinkInFile(llvm::sys::Path(LIBCLC_LIBEXECDIR + triple + ".bc"), isNative); mod = linker.releaseModule(); // Add a function internalizer pass. |