Wiki Roadmap Timeline Tickets New Ticket Source Search Help / Guide About Trac Login

Changeset 1645:1d2d1aa16841

Show
Ignore:
Timestamp:
03/09/10 16:20:39 (2 years ago)
Author:
Matti Niemenmaa <matti.niemenmaa+hg@iki.fi>
branch:
default
Message:

Don't error out with -singleobj, -of, and -c/-output-{bc,ll,o,s}.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • dmd/module.c

    r1640 r1645  
    220220} 
    221221 
    222 void Module::buildTargetFiles(
     222void Module::buildTargetFiles(bool singleObj
    223223{ 
    224224    if(objfile &&  
     
    253253    // LDC 
    254254    // another safety check to make sure we don't overwrite previous output files 
    255     check_and_add_output_file(this, objfile->name->str); 
     255    if (!singleObj) 
     256        check_and_add_output_file(this, objfile->name->str); 
    256257    if (docfile) 
    257258        check_and_add_output_file(this, docfile->name->str); 
  • dmd/module.h

    r1640 r1645  
    189189    // LDC 
    190190    llvm::Module* genLLVMModule(llvm::LLVMContext& context, Ir* sir); 
    191     void buildTargetFiles(); 
     191    void buildTargetFiles(bool singleObj); 
    192192    File* buildFilePath(const char* forcename, const char* path, const char* ext); 
    193193    Module *isModule() { return this; } 
  • gen/main.cpp

    r1644 r1645  
    782782        m->read(0); 
    783783        m->parse(); 
    784         m->buildTargetFiles(); 
     784        m->buildTargetFiles(singleObj); 
    785785        m->deleteObjFile(); 
    786786        if (m->isDocFile) 
Copyright © 2008, LDC Development Team.