Changeset 821

Show
Ignore:
Timestamp:
07/03/07 11:16:53 (1 year ago)
Author:
allenb
Message:

Bug Fix: Using —dbg was broken on non-Windows platforms

Using the —dbg option on Linux made the command output invalid library names (appended a _d to them). This change fixes that problem and adds some
documentation to the —dbg, —opt, and —hybrid command line options.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/fcptr_stable_jun07/osg-config.in

    r657 r821  
    7676   parser.add_option("--libpath-prefix",default=def_libpathprefix,  
    7777                     help="Linker library path prefix to use. (%s)"%def_libpathprefix) 
    78    parser.add_option("--opt",action="store_true",help="Ignored for backwards compatibility.") 
    79    parser.add_option("--dbg",action="store_true",help="Ignored for backwards compatibility.") 
     78   parser.add_option("--opt",action="store_true",help="Output options for optimized libraries.") 
     79   parser.add_option("--dbg",action="store_true",help="Output options for debug libraries.") 
    8080   if "win32" == sys.platform: 
    81       parser.add_option("--hybrid",action="store_true",help="Ignored for backwards compatibility.") 
     81      parser.add_option("--hybrid",action="store_true",help="Output options for hybrid libraries.") 
    8282 
    8383   (options, pos_args) = parser.parse_args()   
    …… 
    123123   lib_suffix = "" 
    124124 
    125    if options.dbg: 
    126        lib_suffix = "_d" 
    127    elif "win32" == sys.platform and options.hybrid: 
    128        lib_suffix = "_h" 
     125   if "win32" == sys.platform: 
     126       if options.dbg: 
     127           lib_suffix = "_d" 
     128       elif options.hybrid: 
     129           lib_suffix = "_h" 
    129130 
    130131   config_info = ConfigInfoAdapter(libraries, lib_map, default_lib_settings,