mirror of
https://github.com/pygos/build.git
synced 2024-11-22 02:59:47 +01:00
Allways build libssp_noshared, even for non hardened toolchains
Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
This commit is contained in:
parent
e87a8ec43c
commit
544ac03d1f
1 changed files with 4 additions and 6 deletions
|
@ -16,11 +16,11 @@ build() {
|
||||||
if [ "x$TC_HARDENING" = "xyes" ]; then
|
if [ "x$TC_HARDENING" = "xyes" ]; then
|
||||||
cflags="$cflags -fPIE -fPIC -fstack-protector-all"
|
cflags="$cflags -fPIE -fPIC -fstack-protector-all"
|
||||||
ldflags="$ldflags -z noexecstack -z relro -z now"
|
ldflags="$ldflags -z noexecstack -z relro -z now"
|
||||||
|
|
||||||
${TARGET}-gcc -c "$SCRIPTDIR/pkg/$PKGNAME/__stack_chk_fail_local.c" -o __stack_chk_fail_local.o
|
|
||||||
${TARGET}-ar r libssp_nonshared.a __stack_chk_fail_local.o
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
${TARGET}-gcc -c "$SCRIPTDIR/pkg/$PKGNAME/__stack_chk_fail_local.c" -o __stack_chk_fail_local.o
|
||||||
|
${TARGET}-ar r libssp_nonshared.a __stack_chk_fail_local.o
|
||||||
|
|
||||||
CFLAGS="$cflags" LDFLAGS="$ldflags" \
|
CFLAGS="$cflags" LDFLAGS="$ldflags" \
|
||||||
CROSS_COMPILE="${TARGET}-" $1/configure --prefix=/ --target="$TARGET"
|
CROSS_COMPILE="${TARGET}-" $1/configure --prefix=/ --target="$TARGET"
|
||||||
CROSS_COMPILE="${TARGET}-" make -j $NUMJOBS
|
CROSS_COMPILE="${TARGET}-" make -j $NUMJOBS
|
||||||
|
@ -61,9 +61,7 @@ deploy() {
|
||||||
find "$DEPLOY/etc" -exec stat {} --printf="%n m %a 0 0\\n" \; | \
|
find "$DEPLOY/etc" -exec stat {} --printf="%n m %a 0 0\\n" \; | \
|
||||||
sed "s#^$DEPLOY/##g" | tail -n +2 >> "$DEPLOY/rootfs_files.txt"
|
sed "s#^$DEPLOY/##g" | tail -n +2 >> "$DEPLOY/rootfs_files.txt"
|
||||||
|
|
||||||
if [ "x$TC_HARDENING" = "xyes" ]; then
|
cp libssp_nonshared.a "$DEPLOY/lib"
|
||||||
cp libssp_nonshared.a "$DEPLOY/lib"
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
check_update() {
|
check_update() {
|
||||||
|
|
Loading…
Reference in a new issue