Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
Pyston
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
Pyston
Commits
4d25af6b
Commit
4d25af6b
authored
9 years ago
by
Daniel Agar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmake fix FindValgrind and integrate with Makefile
parent
5f75bab6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
5 deletions
+7
-5
CMakeLists.txt
CMakeLists.txt
+1
-1
Makefile
Makefile
+4
-2
cmake/FindValgrind.cmake
cmake/FindValgrind.cmake
+2
-2
No files found.
CMakeLists.txt
View file @
4d25af6b
...
...
@@ -91,7 +91,7 @@ if(ENABLE_INTEL_JIT_EVENTS)
add_definitions
(
-DENABLE_INTEL_JIT_EVENTS=1
)
endif
()
add_subdirectory
(
${
DEPS_DIR
}
/llvm-trunk
${
CMAKE_BINARY_DIR
}
/llvm EXCLUDE_FROM_ALL
)
set
(
CMAKE_MODULE_PATH
"
${
CMAKE_BINARY_DIR
}
/llvm/share/llvm/cmake/"
)
list
(
APPEND
CMAKE_MODULE_PATH
"
${
CMAKE_BINARY_DIR
}
/llvm/share/llvm/cmake/"
)
include
(
LLVMConfig
)
llvm_map_components_to_libnames
(
LLVM_LIBS core mcjit native bitreader bitwriter ipo irreader debuginfodwarf instrumentation
${
INTEL_JIT_EVENTS_LIB
}
)
...
...
This diff is collapsed.
Click to expand it.
Makefile
View file @
4d25af6b
...
...
@@ -181,9 +181,11 @@ COMMON_CXXFLAGS += -I$(DEPS_DIR)/lz4-install/include
ifeq
($(ENABLE_VALGRIND),0)
COMMON_CXXFLAGS
+=
-DNVALGRIND
VALGRIND
:=
false
CMAKE_VALGRIND
:=
else
COMMON_CXXFLAGS
+=
-I
$(DEPS_DIR)
/valgrind-3.10.0/include
VALGRIND
:=
VALGRIND_LIB
=
$(DEPS_DIR)
/valgrind-3.10.0-install/lib/valgrind
$(DEPS_DIR)
/valgrind-3.10.0-install/bin/valgrind
CMAKE_VALGRIND
:=
-DENABLE_VALGRIND
=
ON
-DVALGRIND_DIR
=
$(DEPS_DIR)
/valgrind-3.10.0-install/
endif
COMMON_CXXFLAGS
+=
-DGITREV
=
$(
shell
git rev-parse HEAD |
head
-c
12
)
-DLLVMREV
=
$(LLVM_REVISION)
...
...
@@ -909,7 +911,7 @@ $(CMAKE_SETUP_DBG):
@
$(MAKE)
cmake_check
@
$(MAKE)
clang_check
@
mkdir
-p
$(CMAKE_DIR_DBG)
cd
$(CMAKE_DIR_DBG)
;
CC
=
'clang'
CXX
=
'clang++'
cmake
-GNinja
$(SRC_DIR)
-DTEST_THREADS
=
$(TEST_THREADS)
-DCMAKE_BUILD_TYPE
=
Debug
cd
$(CMAKE_DIR_DBG)
;
CC
=
'clang'
CXX
=
'clang++'
cmake
-GNinja
$(SRC_DIR)
-DTEST_THREADS
=
$(TEST_THREADS)
-DCMAKE_BUILD_TYPE
=
Debug
$(CMAKE_VALGRIND)
$(CMAKE_SETUP_RELEASE)
:
@
$(MAKE)
cmake_check
@
$(MAKE)
clang_check
...
...
@@ -929,7 +931,7 @@ CMAKE_SETUP_GCC := $(CMAKE_DIR_GCC)/build.ninja
$(CMAKE_SETUP_GCC)
:
@
$(MAKE)
cmake_check
@
mkdir
-p
$(CMAKE_DIR_GCC)
cd
$(CMAKE_DIR_GCC)
;
CC
=
'
$(GCC)
'
CXX
=
'
$(GPP)
'
cmake
-GNinja
$(SRC_DIR)
-DCMAKE_BUILD_TYPE
=
Debug
cd
$(CMAKE_DIR_GCC)
;
CC
=
'
$(GCC)
'
CXX
=
'
$(GPP)
'
cmake
-GNinja
$(SRC_DIR)
-DCMAKE_BUILD_TYPE
=
Debug
$(CMAKE_VALGRIND)
.PHONY
:
pyston_gcc
pyston_gcc
:
$(CMAKE_SETUP_GCC)
$(NINJA)
-C
$(BUILD_DIR)
/Debug-gcc pyston copy_stdlib copy_libpyston sharedmods ext_pyston ext_cpython
$(NINJAFLAGS)
...
...
This diff is collapsed.
Click to expand it.
cmake/FindValgrind.cmake
View file @
4d25af6b
...
...
@@ -3,8 +3,8 @@ include(FindPackageHandleStandardArgs)
find_path
(
VALGRIND_INCLUDE_DIR
NAMES valgrind.h
PATHS /usr/include /usr/include/valgrind
${
VALGRIND_DIR
}
/include
)
PATHS /usr/include /usr/include/valgrind
${
VALGRIND_DIR
}
/include
/valgrind
)
find_program
(
VALGRIND_BIN NAMES valgrind PATH /usr/bin
${
VALGRIND_DIR
}
/bin
)
find_program
(
VALGRIND_BIN NAMES valgrind PATH
S
/usr/bin
${
VALGRIND_DIR
}
/bin
)
find_package_handle_standard_args
(
valgrind REQUIRED_VARS VALGRIND_BIN VALGRIND_INCLUDE_DIR
)
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment