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
068a3de2
Commit
068a3de2
authored
Jan 28, 2016
by
Kevin Modzelewski
1
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1073 from tony/gmake
Search for gmake and make when building
parents
523ecd6b
055c8c13
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
2 deletions
+20
-2
CMakeLists.txt
CMakeLists.txt
+20
-2
No files found.
CMakeLists.txt
View file @
068a3de2
...
...
@@ -21,6 +21,23 @@ if(NOT ${CMAKE_BUILD_TYPE} STREQUAL "Release" AND NOT ${CMAKE_BUILD_TYPE} STREQU
message
(
FATAL_ERROR
"CMAKE_BUILD_TYPE must be set to Release or Debug"
)
endif
()
if
(
UNIX
)
find_program
(
MAKE_PRG NAMES gmake make
)
if
(
MAKE_PRG
)
execute_process
(
COMMAND
"
${
MAKE_PRG
}
"
--version
OUTPUT_VARIABLE MAKE_VERSION_INFO
)
if
(
NOT
"
${
OUTPUT_VARIABLE
}
"
MATCHES
".*GNU.*"
)
unset
(
MAKE_PRG
)
endif
()
endif
()
if
(
NOT MAKE_PRG
)
message
(
FATAL_ERROR
"GNU Make is required to build the dependencies."
)
else
()
message
(
STATUS
"Found GNU Make at
${
MAKE_PRG
}
"
)
endif
()
endif
()
option
(
ENABLE_CCACHE
"enable caching compiler output"
ON
)
option
(
ENABLE_EXTRA_TESTS
"pyston extra tests"
OFF
)
option
(
ENABLE_GIL
"threading use GIL"
ON
)
...
...
@@ -122,7 +139,8 @@ ExternalProject_Add(libjemalloc
DEPENDS gitsubmodules
UPDATE_COMMAND autoconf
CONFIGURE_COMMAND
${
CMAKE_SOURCE_DIR
}
/build_deps/jemalloc/configure --prefix=
${
CMAKE_BINARY_DIR
}
/jemalloc --enable-autogen --enable-prof-libunwind
INSTALL_COMMAND make install_bin install_lib
BUILD_COMMAND
${
MAKE_PRG
}
INSTALL_COMMAND
${
MAKE_PRG
}
install_bin install_lib
LOG_UPDATE ON
LOG_CONFIGURE ON
LOG_BUILD ON
...
...
@@ -197,7 +215,7 @@ ExternalProject_Add(libunwind
DEPENDS libunwind_patched
UPDATE_COMMAND autoreconf -i
CONFIGURE_COMMAND
${
CMAKE_SOURCE_DIR
}
/build_deps/libunwind/configure
${
LIBUNWIND_DEBUG_CFLAGS
}
--prefix=
${
CMAKE_BINARY_DIR
}
/build_deps/libunwind --enable-shared=0 --disable-block-signals
${
LIBUNWIND_CONSERVATIVE_CHECKS
}
${
LIBUNWIND_DEBUG
}
${
LIBUNWIND_DEBUG_FRAME
}
BUILD_COMMAND
make
-j
${
TEST_THREADS
}
BUILD_COMMAND
${
MAKE_PRG
}
-j
${
TEST_THREADS
}
LOG_UPDATE ON
LOG_CONFIGURE ON
LOG_BUILD ON
...
...
Boxiang Sun
@Daetalus
mentioned in commit
5a1345ca
·
Sep 08, 2016
mentioned in commit
5a1345ca
mentioned in commit 5a1345ca2a0a95ad777f73d2fabf0283ede0e27e
Toggle commit list
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