glibcxx

Author: firewave

Makefile

@@ -44,8 +44,6 @@ ifdef FILESDIR
 endif
 
 RDYNAMIC=-rdynamic
-# Set the CPPCHK_GLIBCXX_DEBUG flag. This flag is not used in release Makefiles.
-# The _GLIBCXX_DEBUG define doesn't work in Cygwin or other Win32 systems.
 ifndef COMSPEC
     ifeq ($(VERBOSE),1)
         $(info COMSPEC not found)
@@ -75,9 +73,6 @@ ifdef WINNT
         $(info WINNT found)
     endif
     #### Maybe Windows
-    ifndef CPPCHK_GLIBCXX_DEBUG
-        CPPCHK_GLIBCXX_DEBUG=
-    endif # !CPPCHK_GLIBCXX_DEBUG
 
     ifeq ($(VERBOSE),1)
         $(info MSYSTEM=$(MSYSTEM))
@@ -99,18 +94,6 @@ else # !WINNT
         $(info uname_S=$(uname_S))
     endif
 
-    ifeq ($(uname_S),Linux)
-        ifndef CPPCHK_GLIBCXX_DEBUG
-            CPPCHK_GLIBCXX_DEBUG=-D_GLIBCXX_DEBUG
-        endif # !CPPCHK_GLIBCXX_DEBUG
-    endif # Linux
-
-    ifeq ($(uname_S),GNU/kFreeBSD)
-        ifndef CPPCHK_GLIBCXX_DEBUG
-            CPPCHK_GLIBCXX_DEBUG=-D_GLIBCXX_DEBUG
-        endif # !CPPCHK_GLIBCXX_DEBUG
-    endif # GNU/kFreeBSD
-
     LDFLAGS+=-pthread
 
 endif # WINNT
@@ -124,13 +107,6 @@ ifdef CYGWIN
     CXXFLAGS+=-Wl,--stack,8388608
 endif # CYGWIN
 
-ifndef CXX
-    CXX=g++
-endif
-
-ifeq (clang++, $(findstring clang++,$(CXX)))
-    CPPCHK_GLIBCXX_DEBUG=
-endif
 ifndef CXXFLAGS
     CXXFLAGS=-pedantic -Wall -Wextra -Wcast-qual -Wfloat-equal -Wmissing-declarations -Wmissing-format-attribute -Wno-long-long -Wpacked -Wredundant-decls -Wundef -Wno-sign-compare -Wno-multichar -Woverloaded-virtual -g
 endif

tools/dmake/dmake.cpp

@@ -623,10 +623,7 @@ int main(int argc, char **argv)
     // enable backtrac
     fout << "RDYNAMIC=-rdynamic\n";
 
-    // The _GLIBCXX_DEBUG doesn't work in cygwin or other Win32 systems.
-    fout << "# Set the CPPCHK_GLIBCXX_DEBUG flag. This flag is not used in release Makefiles.\n"
-         << "# The _GLIBCXX_DEBUG define doesn't work in Cygwin or other Win32 systems.\n"
-         << "ifndef COMSPEC\n"
+    fout << "ifndef COMSPEC\n"
          << "    ifeq ($(VERBOSE),1)\n"
          << "        $(info COMSPEC not found)\n"
          << "    endif\n"
@@ -655,9 +652,6 @@ int main(int argc, char **argv)
          << "        $(info WINNT found)\n"
          << "    endif\n"
          << "    #### Maybe Windows\n"
-         << "    ifndef CPPCHK_GLIBCXX_DEBUG\n"
-         << "        CPPCHK_GLIBCXX_DEBUG=\n"
-         << "    endif # !CPPCHK_GLIBCXX_DEBUG\n"
          << "\n"
          << "    ifeq ($(VERBOSE),1)\n"
          << "        $(info MSYSTEM=$(MSYSTEM))\n"
@@ -679,18 +673,6 @@ int main(int argc, char **argv)
          << "        $(info uname_S=$(uname_S))\n"
          << "    endif\n"
          << "\n"
-         << "    ifeq ($(uname_S),Linux)\n"
-         << "        ifndef CPPCHK_GLIBCXX_DEBUG\n"
-         << "            CPPCHK_GLIBCXX_DEBUG=-D_GLIBCXX_DEBUG\n"
-         << "        endif # !CPPCHK_GLIBCXX_DEBUG\n"
-         << "    endif # Linux\n"
-         << "\n"
-         << "    ifeq ($(uname_S),GNU/kFreeBSD)\n"
-         << "        ifndef CPPCHK_GLIBCXX_DEBUG\n"
-         << "            CPPCHK_GLIBCXX_DEBUG=-D_GLIBCXX_DEBUG\n"
-         << "        endif # !CPPCHK_GLIBCXX_DEBUG\n"
-         << "    endif # GNU/kFreeBSD\n"
-         << "\n"
          << "    LDFLAGS+=-pthread\n"
          << "\n"
          << "endif # WINNT\n"
@@ -706,12 +688,6 @@ int main(int argc, char **argv)
          << "endif # CYGWIN\n"
          << "\n";
 
-    // skip "-D_GLIBCXX_DEBUG" if clang, since it breaks the build
-    makeConditionalVariable(fout, "CXX", "g++");
-    fout << "ifeq (clang++, $(findstring clang++,$(CXX)))\n"
-         << "    CPPCHK_GLIBCXX_DEBUG=\n"
-         << "endif\n";
-
     // Makefile settings..
     if (release) {
         makeConditionalVariable(fout, "CXXFLAGS", "-O2 -Wall -Wno-sign-compare -Wno-multichar");
@@ -733,7 +709,6 @@ int main(int argc, char **argv)
                                 "-Wno-multichar "
                                 "-Woverloaded-virtual "
                                 "-g");
-        //fout << "override CPPFLAGS += $(CPPCHK_GLIBCXX_DEBUG)\n\n"; // TODO: when using CXXOPTS this would always be set - need to handle this differently
     }
 
     fout << "ifeq (g++, $(findstring g++,$(CXX)))\n"