more MacOS gdb fixes

gpertea · gpertea · commit 7b27c4aaaa1e · 2018-07-13T12:53:57.000-04:00
diff --git a/Makefile b/Makefile
@@ -62,7 +62,7 @@ ifdef NOTHREADS
   BASEFLAGS += -DNOTHREADS
 endif
 
-#ifneq (,$(findstring release,$(MAKECMDGOALS)))
+DMACH := $(shell g++ -dumpmachine)
 
 ifneq (,$(filter %release %static, $(MAKECMDGOALS)))
   # -- release build
@@ -91,6 +91,9 @@ else
      #just plain debug build
      DEBUG_BUILD=1
      CXXFLAGS := $(if $(CXXFLAGS),$(CXXFLAGS),-g -O0)
+     ifneq (, $(findstring darwin, $(DMACH)))
+        CXXFLAGS += -gdwarf-3
+     endif
      CXXFLAGS += -DDEBUG -D_DEBUG -DGDEBUG $(BASEFLAGS)
   endif
 endif
@@ -150,6 +153,7 @@ stringtie: ${BAM}/libbam.a $(OBJS) stringtie.o
 # target for removing all object files
 
 clean:
+	echo $(PATH)
 	${RM} stringtie${EXE} stringtie.o*  $(OBJS)
 	${RM} core.*
 allclean cleanAll cleanall:
diff --git a/gclib/GArgs.cpp b/gclib/GArgs.cpp
@@ -2,7 +2,7 @@
 #include "GArgs.h"
 #include <ctype.h>
 
-GArgs::GArgs(int argc, char* const argv[], const char* format, bool nodigitopts) {
+GArgs::GArgs(int argc, char* argv[], const char* format, bool nodigitopts) {
    /* format can be:
       <string>{;|=} e.g. disable-test;PID=S= for --disable-test PID=50 (or --PID 50) S=3.5 etc.
       <letter>[:]  e.g. p:hT  for -p testing (or -ptesting) -h -T
@@ -63,20 +63,24 @@ while (fstr-format < fmtlen ) {
  //-- now parse the arguments based on the given format specification
  parseArgs(nodigitopts);
  }
- 
+
+void dbg_dequote(char* &p) {
+   int alen=strlen(p);
+   if (alen>1 && p[0]=='\'' && p[alen-1]=='\'') {
+	 p++;
+	 p[alen-2 ]='\0';
+   }
+}
+
 int GArgs::parseArgs(bool nodigitopts) {
   int p=1; //skip program name
   int f=0;
   while (p<_argc) {
-   /* silly patch for annnoying OSX gdb issues: 
+   // silly patch for annnoying MacOS gdb/eclipse issues:
    #if defined(__APPLE__) && defined(DEBUG)
-   int alen=strlen(_argv[p]);
-   if (alen>1 && _argv[p][0]=='\'' && _argv[p][alen-1]=='\'') {
-     _argv[p]++;
-     _argv[p][alen-1]='\0';
-   }
+	   dbg_dequote(_argv[p]);
    #endif
-   */
+   //--
    if (_argv[p][0]=='-' && (_argv[p][1]==0 || _argv[p][1]!='-')) { 
      //single-dash argument
      int cpos=1;
@@ -119,8 +123,11 @@ int GArgs::parseArgs(bool nodigitopts) {
             if (_argv[p][cpos+1]=='\0') {
                 if (p+1<_argc && _argv[p+1][0]!=0) { //value is the whole next argument
                    p++;
+				#if defined(__APPLE__) && defined(DEBUG)
+				   dbg_dequote(_argv[p]);
+				#endif
                    args[count].value=Gstrdup(_argv[p]);
-                   }
+                }
                   else {
                    errarg=p;
                    err_valmissing=true;
@@ -234,7 +241,7 @@ void GArgs::printCmdLine(FILE* fout) {
    }
 }
 
-GArgs::GArgs(int argc, char* const argv[], const GArgsDef fmtrecs[], bool nodigitopts) {
+GArgs::GArgs(int argc, char* argv[], const GArgsDef fmtrecs[], bool nodigitopts) {
  fmtcount=0;
  count=0;
  nonOptCount=0;
diff --git a/gclib/GArgs.h b/gclib/GArgs.h
@@ -44,7 +44,7 @@ class GArgs {
      //int code; // if GArgsDef[] constructor was used, for getOpt
      };
    int _argc;            
-   char* const *_argv; //the original main() values
+   char** _argv; //the original main() values
    argdata* args; //arguments table after parsing it
    int count; //total count of elements in 'args' array
    int nonOptCount; //count of non-dashed, non= arguments
@@ -59,14 +59,14 @@ class GArgs {
    int validLongOpt(char* o, char* to);
  public:
  
-   GArgs(int argc, char* const argv[], const char* format, bool nodigitopts=false);
+   GArgs(int argc, char* argv[], const char* format, bool nodigitopts=false);
    /* format can be:
        <string>{;|=} e.g. disable-test;PID=S= for --disable-test PID=50 (or --PID 50) S=3.5 etc.
        <letter>[:]  e.g. p:hT  for -p testing (or -ptesting) -h -T
    This means that the long options, if present, should be given at the beginning
    of the format string, before the single-dash, single-char options
    */
-   GArgs(int argc, char* const argv[], const GArgsDef fmtrecs[], bool nodigitopts=false);
+   GArgs(int argc, char* argv[], const GArgsDef fmtrecs[], bool nodigitopts=false);
    
    ~GArgs();
    int isError(); // returns the offending argv position or 0 if no error
diff --git a/stringtie.cpp b/stringtie.cpp
@@ -248,7 +248,7 @@ int waitForData(BundleData* bundles);
 
 TInputFiles bamreader;
 
-int main(int argc, char * const argv[]) {
+int main(int argc, char* argv[]) {
 
  // == Process arguments.
  GArgs args(argc, argv, 
