Commit b026a08

committed

Slightly less ugly hacks to build nsjail

1 parent 47482ae commit b026a08Copy full SHA for b026a08

File tree

-4

lines changed

-4

lines changed

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,14 +21,13 @@ cp /build/patches/queue.h /output/include/sys && \`
`21`	`21`	`cp bin/protoc /output/bin && \`
`22`	`22`	`cp -r kafel-/ nsjail-*/kafel && \`
`23`	`23`	`cd nsjail-* && \`
`24`		`-find /output && \`
`25`	`24`	`sed -e 's/-Werror//' -e 's/-pie//' -e 's/-fPIE//' -i Makefile && \`
`26`	`25`	`sed -e 's/YYUSE/YY_USE/' -i kafel/src/parser.y && \`
`27`	`26`	`sed -e 's/^TARGET=.*/TARGET=${STATIC_TARGET}/' -i kafel/src/Makefile && \`
`28`	`27`	`export CC="$MUSL_TARGET-gcc -static" && \`
`29`		`-export CXX="$MUSL_TARGET-g++ -static -static-libstdc++" && \`
`30`		`-export CFLAGS="-I/output/include -I/output/include/libnl3 -I/output/include/google -static -frandom-seed=pulse" && \`
`31`		`-export COMMON_FLAGS="-static -I/output/include -I/output/include/libnl3 -I/output/include/google" && \`
	`28`	`+export CXX="$MUSL_TARGET-g++ -static" && \`
	`29`	`+export CFLAGS="-I/output/include -I/output/include/libnl3 -I/output/include/google -frandom-seed=pulse" && \`
	`30`	`+export CXXFLAGS="-static-libstdc++ ${CFLAGS}" && \`
`32`	`31`	`export LDFLAGS="-L/output/lib -pthread -lprotobuf -lnl-route-3 -lnl-3" && \`
`33`	`32`	`make -j$(nproc) && \`
`34`	`33`	`${MUSL_TARGET}-strip nsjail`

Comments

(0)