Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove compile option -fno-stack-protector #529

Closed
wants to merge 1 commit into from
Closed

remove compile option -fno-stack-protector #529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions scripts/buildAlpine6.fish
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ set -g FULLARGS $argv \

if test "$MAINTAINER" = "On"
set -g FULLARGS $FULLARGS \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--build-id $pie -fno-stack-protector"
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--build-id $pie"
else
set -g FULLARGS $FULLARGS \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--build-id $pie $inline -fno-stack-protector" \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--build-id $pie $inline" \
-DUSE_CATCH_TESTS=Off \
-DUSE_GOOGLE_TESTS=Off
end
Expand All @@ -53,27 +53,27 @@ if test "$BUILD_SEPP" = "On"
end

if test "$SAN" = "On"
echo "SAN is not support in this environment"
echo "SAN is not supported in this environment"
exit 1
else if test "$COVERAGE" = "On"
echo "Building with Coverage"
set -g FULLARGS $FULLARGS \
-DUSE_JEMALLOC=$JEMALLOC_OSKAR \
-DCMAKE_C_FLAGS="$pie -fno-stack-protector -fprofile-arcs -ftest-coverage" \
-DCMAKE_CXX_FLAGS="$pie -fno-stack-protector -fprofile-arcs -ftest-coverage" \
-DCMAKE_C_FLAGS="$pie -fprofile-arcs -ftest-coverage" \
-DCMAKE_CXX_FLAGS="$pie -fprofile-arcs -ftest-coverage" \
-DUSE_COVERAGE=ON
else
set -g FULLARGS $FULLARGS \
-DUSE_JEMALLOC=$JEMALLOC_OSKAR

if test "$MAINTAINER" = "On"
set -g FULLARGS $FULLARGS \
-DCMAKE_C_FLAGS="$pie -fno-stack-protector" \
-DCMAKE_CXX_FLAGS="$pie -fno-stack-protector"
-DCMAKE_C_FLAGS="$pie" \
-DCMAKE_CXX_FLAGS="$pie"
else
set -g FULLARGS $FULLARGS \
-DCMAKE_C_FLAGS="$pie $inline -fno-stack-protector" \
-DCMAKE_CXX_FLAGS="$pie $inline -fno-stack-protector"
-DCMAKE_C_FLAGS="$pie $inline" \
-DCMAKE_CXX_FLAGS="$pie $inline"
end
end

Expand Down
16 changes: 8 additions & 8 deletions scripts/buildAlpine7.fish
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ set -g FULLARGS $argv \

if test "$MAINTAINER" = "On"
set -g FULLARGS $FULLARGS \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--build-id $pie -fno-stack-protector"
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--build-id $pie"
else
set -g FULLARGS $FULLARGS \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--build-id $pie $inline -fno-stack-protector" \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--build-id $pie $inline" \
-DUSE_CATCH_TESTS=Off \
-DUSE_GOOGLE_TESTS=Off
end
Expand All @@ -59,21 +59,21 @@ else if test "$COVERAGE" = "On"
echo "Building with Coverage"
set -g FULLARGS $FULLARGS \
-DUSE_JEMALLOC=$JEMALLOC_OSKAR \
-DCMAKE_C_FLAGS="$pie -fno-stack-protector -fprofile-arcs -ftest-coverage" \
-DCMAKE_CXX_FLAGS="$pie -fno-stack-protector -fprofile-arcs -ftest-coverage" \
-DCMAKE_C_FLAGS="$pie -fprofile-arcs -ftest-coverage" \
-DCMAKE_CXX_FLAGS="$pie -fprofile-arcs -ftest-coverage" \
-DUSE_COVERAGE=ON
else
set -g FULLARGS $FULLARGS \
-DUSE_JEMALLOC=$JEMALLOC_OSKAR

if test "$MAINTAINER" = "On"
set -g FULLARGS $FULLARGS \
-DCMAKE_C_FLAGS="$pie -fno-stack-protector" \
-DCMAKE_CXX_FLAGS="$pie -fno-stack-protector"
-DCMAKE_C_FLAGS="$pie" \
-DCMAKE_CXX_FLAGS="$pie"
else
set -g FULLARGS $FULLARGS \
-DCMAKE_C_FLAGS="$pie $inline -fno-stack-protector" \
-DCMAKE_CXX_FLAGS="$pie $inline -fno-stack-protector"
-DCMAKE_C_FLAGS="$pie $inline" \
-DCMAKE_CXX_FLAGS="$pie $inline"
end
end

Expand Down
14 changes: 7 additions & 7 deletions scripts/buildArangoDB6.fish
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ set -g FULLARGS $argv \

if test "$MAINTAINER" = "On"
set -g FULLARGS $FULLARGS \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--build-id $pie -fno-stack-protector"
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--build-id $pie"
else
set -g FULLARGS $FULLARGS \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--build-id $pie $inline -fno-stack-protector" \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--build-id $pie $inline" \
-DUSE_CATCH_TESTS=Off \
-DUSE_GOOGLE_TESTS=Off
end
Expand Down Expand Up @@ -81,20 +81,20 @@ if test "$SAN" = "On"
-DCMAKE_CXX_FLAGS="-pthread $SANITIZERS -fno-sanitize=vptr -fno-sanitize=alignment" \
-DBASE_LIBS="-pthread"
else if test "$COVERAGE" = "On"
echo "COVERAGE is not support in this environment!"
echo "COVERAGE is not supported in this environment!"
exit 1
else
set -g FULLARGS $FULLARGS \
-DUSE_JEMALLOC=$JEMALLOC_OSKAR

if test "$MAINTAINER" = "On"
set -g FULLARGS $FULLARGS \
-DCMAKE_C_FLAGS="$pie -fno-stack-protector" \
-DCMAKE_CXX_FLAGS="$pie -fno-stack-protector"
-DCMAKE_C_FLAGS="$pie" \
-DCMAKE_CXX_FLAGS="$pie"
else
set -g FULLARGS $FULLARGS \
-DCMAKE_C_FLAGS="$pie $inline -fno-stack-protector" \
-DCMAKE_CXX_FLAGS="$pie $inline -fno-stack-protector"
-DCMAKE_C_FLAGS="$pie $inline" \
-DCMAKE_CXX_FLAGS="$pie $inline"
end
end

Expand Down
12 changes: 6 additions & 6 deletions scripts/buildArangoDB7.fish
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ set -g FULLARGS $argv \

if test "$MAINTAINER" = "On"
set -g FULLARGS $FULLARGS \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--build-id $pie -fno-stack-protector"
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--build-id $pie"
else
set -g FULLARGS $FULLARGS \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--build-id $pie $inline -fno-stack-protector" \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--build-id $pie $inline" \
-DUSE_CATCH_TESTS=Off \
-DUSE_GOOGLE_TESTS=Off
end
Expand Down Expand Up @@ -88,12 +88,12 @@ else

if test "$MAINTAINER" = "On"
set -g FULLARGS $FULLARGS \
-DCMAKE_C_FLAGS="$pie -fno-stack-protector" \
-DCMAKE_CXX_FLAGS="$pie -fno-stack-protector"
-DCMAKE_C_FLAGS="$pie" \
-DCMAKE_CXX_FLAGS="$pie"
else
set -g FULLARGS $FULLARGS \
-DCMAKE_C_FLAGS="$pie $inline -fno-stack-protector" \
-DCMAKE_CXX_FLAGS="$pie $inline -fno-stack-protector"
-DCMAKE_C_FLAGS="$pie $inline" \
-DCMAKE_CXX_FLAGS="$pie $inline"
end
end

Expand Down