1
0
mirror of https://github.com/ErnyTech/neomimalloc synced 2024-06-02 03:16:21 +02:00

Fix build regression

Now mimalloc symbols are inside neomimalloc library
This commit is contained in:
Ernesto Castellotti 2019-07-05 01:33:49 +02:00
parent b8b9ab9a55
commit b9584e861f
2 changed files with 23 additions and 11 deletions

View File

@ -13,8 +13,11 @@
"cd $PACKAGE_DIR && git clone --recursive https://github.com/ErnyTech/neomimalloc || true", "cd $PACKAGE_DIR && git clone --recursive https://github.com/ErnyTech/neomimalloc || true",
"cd $PACKAGE_DIR/neomimalloc/source/mimalloc && rm -rf build && mkdir build && cd build && cmake -DMI_OVERRIDE=OFF .. && make" "cd $PACKAGE_DIR/neomimalloc/source/mimalloc && rm -rf build && mkdir build && cd build && cmake -DMI_OVERRIDE=OFF .. && make"
], ],
"sourceFiles": [ "libs-posix" : [
"$PACKAGE_DIR/neomimalloc/source/mimalloc/build/libmimalloc.a" ":libmimalloc.a"
],
"lflags-posix" : [
"-L$PACKAGE_DIR/neomimalloc/source/mimalloc/build"
] ]
}, },
{ {
@ -23,8 +26,11 @@
"cd $PACKAGE_DIR && git clone --recursive https://github.com/ErnyTech/neomimalloc || true", "cd $PACKAGE_DIR && git clone --recursive https://github.com/ErnyTech/neomimalloc || true",
"cd $PACKAGE_DIR/neomimalloc/source/mimalloc && rm -rf build && mkdir build && cd build && cmake -DMI_OVERRIDE=OFF -DMI_SECURE=ON .. && make" "cd $PACKAGE_DIR/neomimalloc/source/mimalloc && rm -rf build && mkdir build && cd build && cmake -DMI_OVERRIDE=OFF -DMI_SECURE=ON .. && make"
], ],
"sourceFiles": [ "libs-posix" : [
"$PACKAGE_DIR/neomimalloc/source/mimalloc/build/libmimalloc-secure.a" ":ibmimalloc-secure.a"
],
"lflags-posix" : [
"-L$PACKAGE_DIR/neomimalloc/source/mimalloc/build"
] ]
}, },
{ {
@ -33,8 +39,11 @@
"cd $PACKAGE_DIR && git clone --recursive https://github.com/ErnyTech/neomimalloc || true", "cd $PACKAGE_DIR && git clone --recursive https://github.com/ErnyTech/neomimalloc || true",
"cd $PACKAGE_DIR/neomimalloc/source/mimalloc && rm -rf build && mkdir build && cd build && cmake -DMI_OVERRIDE=ON .. && make" "cd $PACKAGE_DIR/neomimalloc/source/mimalloc && rm -rf build && mkdir build && cd build && cmake -DMI_OVERRIDE=ON .. && make"
], ],
"sourceFiles": [ "libs-posix" : [
"$PACKAGE_DIR/neomimalloc/source/mimalloc/build/libmimalloc.a" ":libmimalloc.a"
],
"lflags-posix" : [
"-L$PACKAGE_DIR/neomimalloc/source/mimalloc/build"
] ]
}, },
{ {
@ -43,8 +52,11 @@
"cd $PACKAGE_DIR && git clone --recursive https://github.com/ErnyTech/neomimalloc || true", "cd $PACKAGE_DIR && git clone --recursive https://github.com/ErnyTech/neomimalloc || true",
"cd $PACKAGE_DIR/neomimalloc/source/mimalloc && rm -rf build && mkdir build && cd build && cmake -DMI_OVERRIDE=ON -DMI_SECURE=ON .. && make" "cd $PACKAGE_DIR/neomimalloc/source/mimalloc && rm -rf build && mkdir build && cd build && cmake -DMI_OVERRIDE=ON -DMI_SECURE=ON .. && make"
], ],
"sourceFiles": [ "libs-posix" : [
"$PACKAGE_DIR/neomimalloc/source/mimalloc/build/libmimalloc-secure.a" ":ibmimalloc-secure.a"
],
"lflags-posix" : [
"-L$PACKAGE_DIR/neomimalloc/source/mimalloc/build"
] ]
}, },
{ {

View File

@ -202,7 +202,7 @@ struct Mimallocator {
} }
auto sizeOfP = mi_usable_size(p); auto sizeOfP = mi_usable_size(p);
result = p[0 .. sizeOfP]; result = (cast(void*) p)[0 .. sizeOfP];
return Ternary.yes; return Ternary.yes;
} }
@ -233,6 +233,6 @@ struct Mimallocator {
return false; return false;
} }
return mi_check_owned(b.ptr); return mi_check_owned(p);
} }
} }