diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-07-03 04:23:37 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-07-03 04:23:37 +0300 |
commit | ab3933316f4eb3bfa744fa92ce81f333328fb69f (patch) | |
tree | 5d2cadac69b78a6e5c8195d4a05dd884e564bba6 /tools/ci/jobs | |
parent | 11811d5292ade273e296243f18477cd03228efc7 (diff) | |
download | manaverse-ab3933316f4eb3bfa744fa92ce81f333328fb69f.tar.gz manaverse-ab3933316f4eb3bfa744fa92ce81f333328fb69f.tar.bz2 manaverse-ab3933316f4eb3bfa744fa92ce81f333328fb69f.tar.xz manaverse-ab3933316f4eb3bfa744fa92ce81f333328fb69f.zip |
Use for Fedora raw hide own gcc flags, because gcc most time outdated.
Diffstat (limited to 'tools/ci/jobs')
-rwxr-xr-x | tools/ci/jobs/gccsnapshot.sh | 6 | ||||
-rwxr-xr-x | tools/ci/jobs/gccsnapshot_sanitize_tests.sh | 6 | ||||
-rwxr-xr-x | tools/ci/jobs/gccsnapshot_sdl2.sh | 6 | ||||
-rwxr-xr-x | tools/ci/jobs/gccsnapshot_tests.sh | 6 |
4 files changed, 20 insertions, 4 deletions
diff --git a/tools/ci/jobs/gccsnapshot.sh b/tools/ci/jobs/gccsnapshot.sh index b9b677fd8..00e7a9944 100755 --- a/tools/ci/jobs/gccsnapshot.sh +++ b/tools/ci/jobs/gccsnapshot.sh @@ -11,6 +11,10 @@ if [ "$NEWCXX" != "" ]; then export CXX="$NEWCXX" fi +if [ "$FLAGS" == "" ]; then + export FLAGS="gccsnapshot.sh" +fi + export PATH=/usr/lib/gcc-snapshot/bin:$PATH source ./tools/ci/scripts/init.sh @@ -20,7 +24,7 @@ export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \ -std=gnu++1z -Wformat=1 \ -Wno-attributes -fno-omit-frame-pointer" -source ./tools/ci/flags/gccsnapshot.sh +source ./tools/ci/flags/${FLAGS} export CXXFLAGS="$CXXFLAGS $POST_CXXFLAGS" diff --git a/tools/ci/jobs/gccsnapshot_sanitize_tests.sh b/tools/ci/jobs/gccsnapshot_sanitize_tests.sh index 7568d455e..d831291e9 100755 --- a/tools/ci/jobs/gccsnapshot_sanitize_tests.sh +++ b/tools/ci/jobs/gccsnapshot_sanitize_tests.sh @@ -10,6 +10,10 @@ if [ "$NEWCXX" != "" ]; then export CXX="$NEWCXX" fi +if [ "$FLAGS" == "" ]; then + export FLAGS="gccsnapshot.sh" +fi + export LOGFILE=gcc-snapshot.log export PATH=/usr/lib/gcc-snapshot/bin:$PATH @@ -28,7 +32,7 @@ export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \ -std=gnu++1z -Wformat=1 \ -Wno-attributes" -source ./tools/ci/flags/gcc6.sh +source ./tools/ci/flags/${FLAGS} export CXXFLAGS="$CXXFLAGS $POST_CXXFLAGS" diff --git a/tools/ci/jobs/gccsnapshot_sdl2.sh b/tools/ci/jobs/gccsnapshot_sdl2.sh index 6a5cc68bb..82ad35c5b 100755 --- a/tools/ci/jobs/gccsnapshot_sdl2.sh +++ b/tools/ci/jobs/gccsnapshot_sdl2.sh @@ -10,6 +10,10 @@ if [ "$NEWCXX" != "" ]; then export CXX="$NEWCXX" fi +if [ "$FLAGS" == "" ]; then + export FLAGS="gccsnapshot.sh" +fi + export LOGFILE=gcc-snapshot.log export PATH=/usr/lib/gcc-snapshot/bin:$PATH @@ -20,7 +24,7 @@ export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \ -std=gnu++1z -Wformat=1 \ -Wno-attributes -fno-omit-frame-pointer" -source ./tools/ci/flags/gccsnapshot.sh +source ./tools/ci/flags/${FLAGS} export CXXFLAGS="$CXXFLAGS $POST_CXXFLAGS" diff --git a/tools/ci/jobs/gccsnapshot_tests.sh b/tools/ci/jobs/gccsnapshot_tests.sh index 7105356c9..a97e65142 100755 --- a/tools/ci/jobs/gccsnapshot_tests.sh +++ b/tools/ci/jobs/gccsnapshot_tests.sh @@ -10,6 +10,10 @@ if [ "$NEWCXX" != "" ]; then export CXX="$NEWCXX" fi +if [ "$FLAGS" == "" ]; then + export FLAGS="gccsnapshot.sh" +fi + export LOGFILE=gcc-snapshot.log export PATH=/usr/lib/gcc-snapshot/bin:$PATH @@ -20,7 +24,7 @@ export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \ -std=gnu++1z -Wformat=1 \ -Wno-attributes" -source ./tools/ci/flags/gcc6.sh +source ./tools/ci/flags/${FLAGS} export CXXFLAGS="$CXXFLAGS $POST_CXXFLAGS" |