summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2019-12-20 02:26:35 +0300
committerAndrei Karas <akaras@inbox.ru>2019-12-20 02:26:35 +0300
commit6941fd4eeb1dce20aba8c42fd030c2690c37b731 (patch)
treef12f6f2c591998aa725e88352a82a54193fe0a03
parente22b2566130eadc148c7aa89ee3cb429b22f1dfb (diff)
downloadManaVerse-6941fd4eeb1dce20aba8c42fd030c2690c37b731.tar.gz
ManaVerse-6941fd4eeb1dce20aba8c42fd030c2690c37b731.tar.bz2
ManaVerse-6941fd4eeb1dce20aba8c42fd030c2690c37b731.tar.xz
ManaVerse-6941fd4eeb1dce20aba8c42fd030c2690c37b731.zip
Add linking with "-lm -ldl" in sanitize builds due SDL linking issue
-rwxr-xr-xtools/ci/jobs/gcc49_sanitize.sh2
-rwxr-xr-xtools/ci/jobs/gcc49_sanitize_tests.sh2
-rwxr-xr-xtools/ci/jobs/gcc5_sanitize.sh2
-rwxr-xr-xtools/ci/jobs/gcc5_sanitize_tests.sh2
-rwxr-xr-xtools/ci/jobs/gcc6_sanitize.sh2
-rwxr-xr-xtools/ci/jobs/gcc6_sanitize_tests.sh2
-rwxr-xr-xtools/ci/jobs/gcc7_sanitize.sh2
-rwxr-xr-xtools/ci/jobs/gcc7_sanitize_tests.sh2
-rwxr-xr-xtools/ci/jobs/gcc8_sanitize.sh2
-rwxr-xr-xtools/ci/jobs/gcc8_sanitize_tests.sh2
-rwxr-xr-xtools/ci/jobs/gccsnapshot_sanitize_tests.sh2
11 files changed, 22 insertions, 0 deletions
diff --git a/tools/ci/jobs/gcc49_sanitize.sh b/tools/ci/jobs/gcc49_sanitize.sh
index 66a33e84a..a30e9ccd8 100755
--- a/tools/ci/jobs/gcc49_sanitize.sh
+++ b/tools/ci/jobs/gcc49_sanitize.sh
@@ -46,6 +46,8 @@ export CXXFLAGS="$CXXFLAGS -ggdb3 -O2 -ffast-math \
-Wconditionally-supported -Wdate-time -Woverloaded-virtual \
-fno-var-tracking $POST_CXXFLAGS"
+export LDFLAGS="$LDFLAGS -lm -ldl"
+
do_init
run_configure --enable-werror $*
run_make
diff --git a/tools/ci/jobs/gcc49_sanitize_tests.sh b/tools/ci/jobs/gcc49_sanitize_tests.sh
index cfb30f2c7..c6db10ef4 100755
--- a/tools/ci/jobs/gcc49_sanitize_tests.sh
+++ b/tools/ci/jobs/gcc49_sanitize_tests.sh
@@ -46,6 +46,8 @@ export CXXFLAGS="$CXXFLAGS -ggdb3 -O2 -ffast-math \
-Wconditionally-supported -Wdate-time -Woverloaded-virtual \
-fno-var-tracking $POST_CXXFLAGS"
+export LDFLAGS="$LDFLAGS -lm -ldl"
+
do_init
run_configure --enable-unittests=yes $*
export SDL_VIDEODRIVER=dummy
diff --git a/tools/ci/jobs/gcc5_sanitize.sh b/tools/ci/jobs/gcc5_sanitize.sh
index cc8b0f9ae..a51ebcb76 100755
--- a/tools/ci/jobs/gcc5_sanitize.sh
+++ b/tools/ci/jobs/gcc5_sanitize.sh
@@ -58,6 +58,8 @@ export CXXFLAGS="$CXXFLAGS -ggdb3 -O2 -pipe -ffast-math \
-Wreturn-type -Wsequence-point -Wswitch \
-Wno-attributes $POST_CXXFLAGS"
+export LDFLAGS="$LDFLAGS -lm -ldl"
+
do_init
run_configure --enable-werror $*
run_make
diff --git a/tools/ci/jobs/gcc5_sanitize_tests.sh b/tools/ci/jobs/gcc5_sanitize_tests.sh
index 24a2f7104..68920abd6 100755
--- a/tools/ci/jobs/gcc5_sanitize_tests.sh
+++ b/tools/ci/jobs/gcc5_sanitize_tests.sh
@@ -58,6 +58,8 @@ export CXXFLAGS="-ggdb3 -O2 -ffast-math \
-Wreturn-type -Wsequence-point -Wswitch \
-Wno-attributes"
+export LDFLAGS="$LDFLAGS -lm -ldl"
+
do_init
run_configure --enable-unittests=yes $*
export SDL_VIDEODRIVER=dummy
diff --git a/tools/ci/jobs/gcc6_sanitize.sh b/tools/ci/jobs/gcc6_sanitize.sh
index a0f02ed7d..c225ef2be 100755
--- a/tools/ci/jobs/gcc6_sanitize.sh
+++ b/tools/ci/jobs/gcc6_sanitize.sh
@@ -27,6 +27,8 @@ export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
-std=gnu++1z -Wformat=1 \
-Wno-attributes -fno-omit-frame-pointer"
+export LDFLAGS="$LDFLAGS -lm -ldl"
+
source ./tools/ci/flags/gcc6.sh
export CXXFLAGS="$CXXFLAGS $POST_CXXFLAGS"
diff --git a/tools/ci/jobs/gcc6_sanitize_tests.sh b/tools/ci/jobs/gcc6_sanitize_tests.sh
index a94d4ffcc..5a2015d01 100755
--- a/tools/ci/jobs/gcc6_sanitize_tests.sh
+++ b/tools/ci/jobs/gcc6_sanitize_tests.sh
@@ -28,6 +28,8 @@ export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O2 -Wstrict-aliasing=2 \
-std=gnu++1z -Wformat=1 \
-Wno-attributes"
+export LDFLAGS="$LDFLAGS -lm -ldl"
+
#source ./tools/ci/flags/gcc6.sh
export CXXFLAGS="$CXXFLAGS $POST_CXXFLAGS"
diff --git a/tools/ci/jobs/gcc7_sanitize.sh b/tools/ci/jobs/gcc7_sanitize.sh
index 79b6a80f8..89c229199 100755
--- a/tools/ci/jobs/gcc7_sanitize.sh
+++ b/tools/ci/jobs/gcc7_sanitize.sh
@@ -30,6 +30,8 @@ export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
-std=gnu++1z -Wformat=1 \
-Wno-attributes -fno-omit-frame-pointer"
+export LDFLAGS="$LDFLAGS -lm -ldl"
+
source ./tools/ci/flags/gcc7.sh
export CXXFLAGS="$CXXFLAGS $POST_CXXFLAGS"
diff --git a/tools/ci/jobs/gcc7_sanitize_tests.sh b/tools/ci/jobs/gcc7_sanitize_tests.sh
index 30d596005..735a70c87 100755
--- a/tools/ci/jobs/gcc7_sanitize_tests.sh
+++ b/tools/ci/jobs/gcc7_sanitize_tests.sh
@@ -31,6 +31,8 @@ export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O2 -Wstrict-aliasing=2 \
-std=gnu++1z -Wformat=1 \
-Wno-attributes"
+export LDFLAGS="$LDFLAGS -lm -ldl"
+
#source ./tools/ci/flags/gcc7.sh
export CXXFLAGS="$CXXFLAGS $POST_CXXFLAGS"
diff --git a/tools/ci/jobs/gcc8_sanitize.sh b/tools/ci/jobs/gcc8_sanitize.sh
index e93541e05..724cd2017 100755
--- a/tools/ci/jobs/gcc8_sanitize.sh
+++ b/tools/ci/jobs/gcc8_sanitize.sh
@@ -31,6 +31,8 @@ export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
-std=gnu++2a -Wformat=1 \
-Wno-attributes -fno-omit-frame-pointer"
+export LDFLAGS="$LDFLAGS -lm -ldl"
+
source ./tools/ci/flags/gcc8.sh
export CXXFLAGS="$CXXFLAGS $POST_CXXFLAGS"
diff --git a/tools/ci/jobs/gcc8_sanitize_tests.sh b/tools/ci/jobs/gcc8_sanitize_tests.sh
index 8ed4a0af0..ed133d68d 100755
--- a/tools/ci/jobs/gcc8_sanitize_tests.sh
+++ b/tools/ci/jobs/gcc8_sanitize_tests.sh
@@ -32,6 +32,8 @@ export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O2 -Wstrict-aliasing=2 \
-std=gnu++2a -Wformat=1 \
-Wno-attributes"
+export LDFLAGS="$LDFLAGS -lm -ldl"
+
#source ./tools/ci/flags/gcc8.sh
export CXXFLAGS="$CXXFLAGS $POST_CXXFLAGS"
diff --git a/tools/ci/jobs/gccsnapshot_sanitize_tests.sh b/tools/ci/jobs/gccsnapshot_sanitize_tests.sh
index 25e94b9a2..ffeb999b3 100755
--- a/tools/ci/jobs/gccsnapshot_sanitize_tests.sh
+++ b/tools/ci/jobs/gccsnapshot_sanitize_tests.sh
@@ -38,6 +38,8 @@ export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O2 -Wstrict-aliasing=2 \
-Wno-attributes \
-Wno-deprecated-copy"
+export LDFLAGS="$LDFLAGS -lm -ldl"
+
#source ./tools/ci/flags/${FLAGS}
export CXXFLAGS="$CXXFLAGS $POST_CXXFLAGS"