File tree Expand file tree Collapse file tree 2 files changed +3
-2
lines changed
Expand file tree Collapse file tree 2 files changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -75,6 +75,7 @@ in stdenv.mkDerivation {
7575 export CFLAGS="$CFLAGS -static -Wno-format-security -I${ riscv64-jemalloc } /include "
7676 export CXXFLAGS="$CXXFLAGS -static -Wno-format-security -I${ riscv64-jemalloc } /include"
7777 export LDFLAGS="$LDFLAGS -static -ljemalloc -L${ riscv64-jemalloc } /lib"
78+ export LIBS="${ riscv64-jemalloc } /lib/libjemalloc.a"
7879
7980 pushd $SPEC && source shrc && popd
8081 make copy-all-src
Original file line number Diff line number Diff line change 133133 ] ;
134134 preBuild = ''
135135 # Add weak attribute to C++ operators, same as jemalloc_cpp.patch
136- sed -i 's/void \* operator new(size_t) /void *operator new(size_t) __attribute__((weak))/g' src/jemalloc_cpp.cpp
137- sed -i 's/void operator delete(void \*) /void operator delete(void *) __attribute__((weak))/g' src/jemalloc_cpp.cpp
136+ sed -i '/void/N; s/void[[:space:]]*\*[[:space:]]* operator new/void __attribute__((weak)) *operator new /g' src/jemalloc_cpp.cpp
137+ sed -i '/void/N; s/void[[:space:]]* operator delete/void __attribute__((weak)) operator delete /g' src/jemalloc_cpp.cpp
138138 '' ;
139139 # Ensure static libraries are installed
140140 postInstall = ''
You can’t perform that action at this time.
0 commit comments