Changeset 1826

Show
Ignore:
Timestamp:
05/03/10 13:58:08 (10 years ago)
Author:
arnonym
Message:

Hmpf, this compiler-flags stuff all seems like a big hack...

Does this fix part of #278?

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/libffado-2.0/SConstruct

    r1750 r1826  
    7979        'CC', 
    8080        'CFLAGS', 
     81        'CCFLAGS', 
    8182        'CXX', 
    8283        'CXXFLAGS', 
     
    9293 
    9394if os.environ.has_key('LDFLAGS'): 
    94         env['LINKFLAGS'] = os.environ['LDFLAGS'] 
     95        env.MergeFlags = os.environ['LDFLAGS'] 
    9596 
    9697# grab OS CFLAGS / CCFLAGS 
     
    9899if os.environ.has_key('CFLAGS'): 
    99100        env['OS_CFLAGS'] = os.environ['CFLAGS'] 
     101        env.MergeFlags( os.environ['CFLAGS'] ) 
    100102env['OS_CCFLAGS']=[] 
    101103if os.environ.has_key('CCFLAGS'): 
    102104        env['OS_CCFLAGS'] = os.environ['CCFLAGS'] 
     105        env.MergeFlags( os.environ['CCFLAGS'] ) 
    103106 
    104107Help( """