diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-02-22 20:55:27 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-02-22 20:55:27 +0100 |
| commit | f4284ba6bdbe682b9d6737ba2d8ac9c7fbc1f0f5 (patch) | |
| tree | ba5b9d130ccf6c03bfdd4791bbc55d2db4455327 /mysys | |
| parent | e605213c2a52bb0991853acd9a9d42897613abd6 (diff) | |
| download | mariadb-git-f4284ba6bdbe682b9d6737ba2d8ac9c7fbc1f0f5.tar.gz | |
Fix BUILD/compile-pentium64-xxx scripts, when ccache is present.
Fix contains of :
- splitting CC/CXX if there are more that 2 space-delimited tokens, add the rest to CFLAGS
(in this case CC was set to "ccache gcc --pipe", and this broke recognition of gcc compiler
as CMake understands CC consisting of 2 space delimited tokens but not more)
- add my_new.cc to mysys fle list if C++ operator new is not found. Always, not only
for gcc (the original problem was that missing operator new when compiling with CXX=gcc)
Diffstat (limited to 'mysys')
| -rwxr-xr-x | mysys/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt index c035a2f0b49..2fbaac7fe72 100755 --- a/mysys/CMakeLists.txt +++ b/mysys/CMakeLists.txt @@ -42,7 +42,7 @@ IF (WIN32) SET (MYSYS_SOURCES ${MYSYS_SOURCES} my_winthread.c my_wincond.c my_winerr.c my_winfile.c my_windac.c my_conio.c) ENDIF() -IF(CMAKE_COMPILER_IS_GNUCC AND NOT HAVE_CXX_NEW) +IF(NOT HAVE_CXX_NEW) # gcc as C++ compiler does not have new/delete SET(MYSYS_SOURCES ${MYSYS_SOURCES} my_new.cc) ADD_DEFINITIONS( -DUSE_MYSYS_NEW) |