diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2012-09-07 10:12:32 +0200 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2012-09-07 10:12:32 +0200 |
| commit | b143676297032ab143ae9f16e85151a5edb137cd (patch) | |
| tree | 33f052b98a96e8bdff56c05aa40424c88dd2b229 /cmake | |
| parent | e7f38f11ebef5cb23a0b2665df8c008054d643d3 (diff) | |
| download | mariadb-git-b143676297032ab143ae9f16e85151a5edb137cd.tar.gz | |
Bug#14593123 CONFIGURE.PL WITH CMAKE2.8 BREAKS THE BUILD
Ignore --with-client-ldflags
it's not supported by the cmake scripts anyways.
Ignore --with-mysqld-ldflags
it's only used with --with-mysqld-ldflags=-static
and that doesn't work.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/configure.pl | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/cmake/configure.pl b/cmake/configure.pl index 565de571452..dea641ef889 100644 --- a/cmake/configure.pl +++ b/cmake/configure.pl @@ -211,6 +211,16 @@ foreach my $option (@ARGV) $cmakeargs = $cmakeargs." -DENABLE_GCOV=ON"; next; } + if ($option =~ /with-client-ldflags/) + { + print("configure.pl : ignoring $option\n"); + next; + } + if ($option =~ /with-mysqld-ldflags=/) + { + print("configure.pl : ignoring $option\n"); + next; + } $option = uc($option); $option =~ s/-/_/g; |