@ -451,9 +451,9 @@ class CompilerArgs(list):
Returns whether the argument can be safely de - duped . This is dependent Returns whether the argument can be safely de - duped . This is dependent
on three things : on three things :
a ) Whether an argument can be ' overriden ' by a later argument . For a ) Whether an argument can be ' overridd en ' by a later argument . For
example , - DFOO defines FOO and - UFOO undefines FOO . In this case , we example , - DFOO defines FOO and - UFOO undefines FOO . In this case , we
can safely remove the previous occura nce and add a new one . The same can safely remove the previous occurre nce and add a new one . The same
is true for include paths and library paths with - I and - L . For is true for include paths and library paths with - I and - L . For
these we return ` 2 ` . See ` dedup2_prefixes ` and ` dedup2_args ` . these we return ` 2 ` . See ` dedup2_prefixes ` and ` dedup2_args ` .
b ) Arguments that once specified cannot be undone , such as ` - c ` or b ) Arguments that once specified cannot be undone , such as ` - c ` or
@ -511,10 +511,10 @@ class CompilerArgs(list):
continue continue
i = self . index ( each ) i = self . index ( each )
if group_start < 0 : if group_start < 0 :
# First occura nce of a library # First occurre nce of a library
group_start = i group_start = i
if group_start > = 0 : if group_start > = 0 :
# Last occura nce of a library # Last occurre nce of a library
self . insert ( i + 1 , ' -Wl,--end-group ' ) self . insert ( i + 1 , ' -Wl,--end-group ' )
self . insert ( group_start , ' -Wl,--start-group ' ) self . insert ( group_start , ' -Wl,--start-group ' )
return self . compiler . unix_args_to_native ( self ) return self . compiler . unix_args_to_native ( self )
@ -548,15 +548,15 @@ class CompilerArgs(list):
raise TypeError ( ' can only concatenate list (not " {} " ) to list ' . format ( args ) ) raise TypeError ( ' can only concatenate list (not " {} " ) to list ' . format ( args ) )
for arg in args : for arg in args :
# If the argument can be de-duped, do it either by removing the # If the argument can be de-duped, do it either by removing the
# previous occura nce of it and adding a new one, or not adding the # previous occurre nce of it and adding a new one, or not adding the
# new occura nce. # new occurre nce.
dedup = self . _can_dedup ( arg ) dedup = self . _can_dedup ( arg )
if dedup == 1 : if dedup == 1 :
# Argument already exists and adding a new instance is useless # Argument already exists and adding a new instance is useless
if arg in self or arg in pre or arg in post : if arg in self or arg in pre or arg in post :
continue continue
if dedup == 2 : if dedup == 2 :
# Remove all previous occura nces of the arg and add it anew # Remove all previous occurre nces of the arg and add it anew
if arg in self : if arg in self :
self . remove ( arg ) self . remove ( arg )
if arg in pre : if arg in pre :
@ -605,7 +605,7 @@ class Compiler:
self . exelist = exelist self . exelist = exelist
else : else :
raise TypeError ( ' Unknown argument to Compiler ' ) raise TypeError ( ' Unknown argument to Compiler ' )
# In case it's been overriden by a child class already # In case it's been overridd en by a child class already
if not hasattr ( self , ' file_suffixes ' ) : if not hasattr ( self , ' file_suffixes ' ) :
self . file_suffixes = lang_suffixes [ self . language ] self . file_suffixes = lang_suffixes [ self . language ]
if not hasattr ( self , ' can_compile_suffixes ' ) : if not hasattr ( self , ' can_compile_suffixes ' ) :
Jussi Pakkanen
7 years ago
committed by
GitHub