summaryrefslogtreecommitdiff
path: root/BUILD/FINISH.sh
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2013-05-15 16:28:12 +0300
committerMichael Widenius <monty@askmonty.org>2013-05-15 16:28:12 +0300
commit0fa7729954c1be9ad20f1a39fc89d3e485a4d9eb (patch)
tree036dfe7283b705920aafe0a707c125cd7886f098 /BUILD/FINISH.sh
parent19cb1c4748eab1f658373ad1b3893843ad46e749 (diff)
downloadmariadb-git-0fa7729954c1be9ad20f1a39fc89d3e485a4d9eb.tar.gz
- Solaris fixes:
- Fixed that wait_timeout_func and wait_timeout tests works on solaris - We have to compile without NO_ALARM on Solaris as Solaris doesn't support timeouts on sockets with setsockopt(.. SO_RCVTIMEO). - Fixed that compile-solaris-amd64-debug works (before that we got a wrong ELF class: ELFCLASS64 on linkage) - Fixed some compiler warnings - Fixed some failing tests BUILD/compile-solaris-amd64-debug: Fixed that compile-solaris-amd64-debug works (before that we got a wrong ELF class: ELFCLASS64 on linkage) configure.cmake: We have to compile without NO_ALARM on Solaris as Solaris doesn't support timeouts on sockets with setsockopt(.. SO_RCVTIMEO) mysql-test/suite/parts/t/partition_basic_innodb.test: Mark test as big test (as otherwise we get timeout on our opensolaris machine in buildbot) mysql-test/suite/rpl/t/rpl_cant_read_event_incident.test: Remove warning
Diffstat (limited to 'BUILD/FINISH.sh')
-rw-r--r--BUILD/FINISH.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh
index e29b6936849..86085fcc593 100644
--- a/BUILD/FINISH.sh
+++ b/BUILD/FINISH.sh
@@ -42,8 +42,7 @@ path=`dirname $0`
if [ -z "$just_clean" ]
then
commands="$commands
-CC=\"$CC\" CFLAGS=\"$cflags\" CXX=\"$CXX\" CXXFLAGS=\"$cxxflags\" CXXLDFLAGS=\"$CXXLDFLAGS\" \
-$configure"
+CC=\"$CC\" CFLAGS=\"$cflags\" CXX=\"$CXX\" CXXFLAGS=\"$cxxflags\" CXXLDFLAGS=\"$CXXLDFLAGS\" $configure"
fi
if [ -z "$just_configure" -a -z "$just_clean" ]