1
1
mirror of https://github.com/rui314/mold.git synced 2024-09-21 01:47:11 +03:00

Add mimalloc as a git submodule

This change adds mimalloc as a git submodule so that `make` doesn't
try to clone mimalloc repo. This change should allow building mold
with the nix package manager, which doesn't provide network access
while building.

This change may conflict with a local `mimalloc` directory. If you
already have checked out mold and `mimalloc` directory exists in the
mold directory, you may need to remove it by `rm -r mimalloc` before
running `make`.

Requested by David Yamnitsky.

Fixes https://github.com/rui314/mold/issues/50
This commit is contained in:
Rui Ueyama 2021-06-10 13:11:35 +09:00
parent bb050128b3
commit cce738c9d5
5 changed files with 6 additions and 4 deletions

1
.gitignore vendored
View File

@ -7,5 +7,4 @@ options.inc
core core
ld ld
oneTBB oneTBB
mimalloc
gentoo gentoo

3
.gitmodules vendored
View File

@ -0,0 +1,3 @@
[submodule "mimalloc"]
path = mimalloc
url = https://github.com/microsoft/mimalloc.git

View File

@ -64,8 +64,7 @@ $(MIMALLOC_LIB): mimalloc/CMakeLists.txt
$(MAKE) -C mimalloc/out/release $(MAKE) -C mimalloc/out/release
mimalloc/CMakeLists.txt: mimalloc/CMakeLists.txt:
git clone https://github.com/microsoft/mimalloc git submodule update --init --recursive
(cd mimalloc; git checkout -q v2.0.1)
test tests check: all test tests check: all
$(MAKE) -C test --output-sync --no-print-directory $(MAKE) -C test --output-sync --no-print-directory

View File

@ -63,7 +63,7 @@ environment, you can build mold by the following commands.
``` ```
$ sudo apt-get install build-essential libstdc++-10-dev cmake clang libssl-dev zlib1g-dev libxxhash-dev libtbb-dev git $ sudo apt-get install build-essential libstdc++-10-dev cmake clang libssl-dev zlib1g-dev libxxhash-dev libtbb-dev git
$ git clone https://github.com/rui314/mold.git $ git clone --recursive https://github.com/rui314/mold.git
$ cd mold $ cd mold
$ make $ make
``` ```

1
mimalloc Submodule

@ -0,0 +1 @@
Subproject commit b19da8e362acae8944c60a40cf5c40c8f5ebeb44