Changeset 799

Show
Ignore:
Timestamp:
09/03/07 22:32:22 (1 year ago)
Author:
Gregor
Message:

sss/build.d, sss/conf.d: Object files are now put in compiler-specific directories (see

ticket #128).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/docs/ChangeLog

    r798 r799  
    55        - Added a warning for targets containing no files. 
    66        - Fixed a hang in rebuild with unmatched braces (see ticket #129). 
     7        - Object files are now put in compiler-specific directories (see 
     8          ticket #128). 
    79 
    8100.72 from 0.71: 
  • trunk/sss/build.d

    r797 r799  
    7070    // add -oq if we don't have such a setting 
    7171    if (find(forceFlags, "-o") == -1) { 
    72         mkdirP("dsss_objs"); 
    73         bl ~= "-oqdsss_objs "; 
     72        mkdirP("dsss_objs" ~ std.path.sep ~ compilerShort()); 
     73        bl ~= "-oqdsss_objs" ~ std.path.sep ~ compilerShort() ~ " "; 
    7474    } 
    7575     
  • trunk/sss/conf.d

    r797 r799  
    12601260} 
    12611261 
     1262/// Get the short name for the compiler 
     1263char[] compilerShort() 
     1264{ 
     1265    if (targetVersion("GNU")) { 
     1266        return DSSS_PLATFORM_GDC; 
     1267    } else if (targetVersion("DigitalMars")) { 
     1268        return DSSS_PLATFORM_DMD; 
     1269    } else { 
     1270        return DSSS_PLATFORM_OTHER; 
     1271    } 
     1272} 
     1273 
    12621274/// Generate a library name from a section 
    12631275char[] libraryName(char[] pkg) 
     
    12741286    // <compiler> 
    12751287    // FIXME: this should check with dsss_build 
    1276     if (targetVersion("GNU")) { 
    1277         lname ~= DSSS_PLATFORM_GDC; 
    1278     } else if (targetVersion("DigitalMars")) { 
    1279         lname ~= DSSS_PLATFORM_DMD; 
    1280     } else { 
    1281         lname ~= DSSS_PLATFORM_OTHER; 
    1282     } 
    1283     lname ~= "-"; 
     1288    lname ~= compilerShort() ~ "-"; 
    12841289 
    12851290    // <package>