From 985268a76afe8d8fbf6a6e7776ffc3d7e9d7f8f8 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Fri, 17 Jan 2020 20:50:38 +0100 Subject: [PATCH] Stick to the default stack protector --- src/project.conf | 2 +- src/transport/project.conf | 2 +- tests/project.conf | 2 +- tools/project.conf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/project.conf b/src/project.conf index 456c88a..21338c3 100644 --- a/src/project.conf +++ b/src/project.conf @@ -1,7 +1,7 @@ targets=libApp cppflags_force=-I ../include cflags_force=-fPIC `pkg-config --cflags libSystem libMarshall` -cflags=-W -Wall -g -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all +cflags=-W -Wall -g -O2 -D_FORTIFY_SOURCE=2 -fstack-protector ldflags_force=`pkg-config --libs libSystem libMarshall` ldflags=-Wl,-z,relro -Wl,-z,now dist=Makefile,appinterface.h,appmessage.h,appstatus.h,apptransport.h diff --git a/src/transport/project.conf b/src/transport/project.conf index 86a561c..2e04480 100644 --- a/src/transport/project.conf +++ b/src/transport/project.conf @@ -2,7 +2,7 @@ targets=self,tcp,tcp4,tcp6,template,udp,udp4,udp6 cppflags_force=-I ../../include cppflags= cflags_force=-fPIC `pkg-config --cflags libSystem` -cflags=-W -Wall -g -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all +cflags=-W -Wall -g -O2 -D_FORTIFY_SOURCE=2 -fstack-protector ldflags_force=`pkg-config --libs libSystem` -L$(OBJDIR).. -lApp ldflags=-Wl,-z,relro -Wl,-z,now dist=Makefile,common.h,common.c diff --git a/tests/project.conf b/tests/project.conf index 90a1727..2e52f30 100644 --- a/tests/project.conf +++ b/tests/project.conf @@ -1,7 +1,7 @@ targets=AppBroker,Dummy.h,appclient,appinterface,appmessage,appserver,fixme.log,includes,lookup,shlint.log,tests.log,transport cppflags_force=-I../include -I. -I$(OBJDIR). cflags_force=`pkg-config --cflags libSystem` -cflags=-W -Wall -g -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector-all +cflags=-W -Wall -g -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector ldflags_force=`pkg-config --libs libSystem` -L$(OBJDIR)../src -Wl,-rpath,$(OBJDIR)../src -lApp ldflags=-pie -Wl,-z,relro -Wl,-z,now -rdynamic dist=System/App.h,appbroker.sh,fixme.sh,Makefile,Test.expected,Test.interface,pkgconfig.sh,shlint.sh,tests.sh diff --git a/tools/project.conf b/tools/project.conf index e367450..55841ef 100644 --- a/tools/project.conf +++ b/tools/project.conf @@ -2,7 +2,7 @@ targets=AppBroker,AppClient cppflags_force=-I ../include cppflags= cflags_force=`pkg-config --cflags libSystem libMarshall` -cflags=-W -Wall -g -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector-all +cflags=-W -Wall -g -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector ldflags_force=-L$(OBJDIR)../src `pkg-config --libs libSystem libMarshall` -lApp ldflags=-pie -Wl,-z,relro -Wl,-z,now dist=Makefile