Skip to content

Remove llvm from cling runtime #648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Axel-Naumann merged 2 commits into from
Jun 14, 2017
Merged

Remove llvm from cling runtime #648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
750566a
Remove unused #include.
Axel-Naumann Jun 14, 2017
15db1c8
cling runtime does not depend on llvm headers anymore.
Axel-Naumann Jun 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 0 additions & 26 deletions core/clingutils/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,32 +95,6 @@ foreach(file wchar.h bits/stat.h bits/time.h)
endif()
endforeach()

foreach( file llvm/ADT/IntrusiveRefCntPtr.h
llvm/ADT/SmallVector.h
llvm/ADT/iterator_range.h
llvm/Config/llvm-config.h
llvm/Support/AlignOf.h
llvm/Support/Allocator.h
llvm/Support/Casting.h
llvm/Support/Compiler.h
llvm/Support/DataTypes.h
llvm/Support/MathExtras.h
llvm/Support/Memory.h
llvm/Support/SwapByteOrder.h
llvm/Support/type_traits.h )
get_filename_component(path ${file} PATH)
if(EXISTS ${llvminclude}/${file})
list(APPEND copy_commands COMMAND ${CMAKE_COMMAND} -E copy ${llvminclude}/${file} ${CMAKE_BINARY_DIR}/etc/cling/${file})
list(APPEND files_to_copy ${llvminclude}/${file})
install(FILES ${llvminclude}/${file} DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/cling/${path})
else()
list(APPEND copy_commands COMMAND ${CMAKE_COMMAND} -E copy ${llvminclude-bin}/${file} ${CMAKE_BINARY_DIR}/etc/cling/${file})
list(APPEND files_to_copy ${llvminclude-bin}/${file})
install(FILES ${llvminclude-bin}/${file} DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/cling/${path})
endif()
set_property(GLOBAL APPEND PROPERTY CLINGETCPCH etc/cling/${file})
endforeach()

set(stamp_file ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/LLVMRES.stamp)
add_custom_command(OUTPUT ${stamp_file}
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/etc/cling/lib/clang/${LLVM_VERSION}/include
Expand Down
20 changes: 2 additions & 18 deletions interpreter/cling/Module.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,10 @@ CLINGETC_CLING := DynamicExprInfo.h DynamicLookupRuntimeUniverse.h \
DynamicLookupLifetimeHandler.h \
Exception.h RuntimePrintValue.h RuntimeUniverse.h Value.h

CLINGETC_LLVM := llvm/ADT/IntrusiveRefCntPtr.h \
llvm/ADT/SmallVector.h \
llvm/ADT/iterator_range.h \
llvm/Config/llvm-config.h \
llvm/Support/AlignOf.h \
llvm/Support/Allocator.h \
llvm/Support/Casting.h \
llvm/Support/Compiler.h \
llvm/Support/DataTypes.h \
llvm/Support/MathExtras.h \
llvm/Support/Memory.h \
llvm/Support/SwapByteOrder.h \
llvm/Support/type_traits.h

CLINGETCPCH := $(addprefix etc/cling/Interpreter/,$(CLINGETC_CLING)) \
$(addprefix etc/cling/,$(CLINGETC_LLVM))
CLINGETCPCH := $(addprefix etc/cling/Interpreter/,$(CLINGETC_CLING))
CLINGETC := $(CLINGETCPCH) $(addprefix etc/cling/cint/,multimap multiset)

CLINGETC_ORIGINALS := $(addprefix $(call stripsrc,$(LLVMDIRI))/include/,$(CLINGETC_LLVM)) \
$(addprefix $(CLINGDIR)/include/cling/,$(CLINGETC_CLING))
CLINGETC_ORIGINALS := $(addprefix $(CLINGDIR)/include/cling/,$(CLINGETC_CLING))

ifneq ($(LLVMDEV),)
CLINGEXES := $(wildcard $(MODDIR)/tools/driver/*.cpp) \
Expand Down
1 change: 0 additions & 1 deletion interpreter/cling/include/cling/Interpreter/Exception.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
#ifndef CLING_RUNTIME_EXCEPTION_H
#define CLING_RUNTIME_EXCEPTION_H

#include "llvm/Support/Compiler.h"
#include <stdexcept>

namespace clang {
Expand Down