mirror of
https://github.com/RT-Thread/rt-thread.git
synced 2026-09-20 17:44:20 +08:00
[gcc][armcc][armclang] rtconfig.CROSS_TOOL->rtconfig.PLATFORM
This commit is contained in:
+5
-5
@@ -124,7 +124,7 @@ class Win32Spawn:
|
||||
# generate cconfig.h file
|
||||
def GenCconfigFile(env, BuildOptions):
|
||||
|
||||
if rtconfig.PLATFORM == 'gcc':
|
||||
if rtconfig.PLATFORM in ['gcc']:
|
||||
contents = ''
|
||||
if not os.path.isfile('cconfig.h'):
|
||||
import gcc
|
||||
@@ -287,7 +287,7 @@ def PrepareBuilding(env, root_directory, has_libcpu=False, remove_components = [
|
||||
GenCconfigFile(env, BuildOptions)
|
||||
|
||||
# auto append '_REENT_SMALL' when using newlib 'nano.specs' option
|
||||
if rtconfig.PLATFORM == 'gcc' and str(env['LINKFLAGS']).find('nano.specs') != -1:
|
||||
if rtconfig.PLATFORM in ['gcc'] and str(env['LINKFLAGS']).find('nano.specs') != -1:
|
||||
env.AppendUnique(CPPDEFINES = ['_REENT_SMALL'])
|
||||
|
||||
if GetOption('genconfig'):
|
||||
@@ -618,7 +618,7 @@ def DefineGroup(name, src, depend, **parameters):
|
||||
group['LOCAL_CPPPATH'] = paths
|
||||
|
||||
|
||||
if rtconfig.PLATFORM == 'gcc':
|
||||
if rtconfig.PLATFORM in ['gcc']:
|
||||
if 'CFLAGS' in group:
|
||||
group['CFLAGS'] = utils.GCCC99Patch(group['CFLAGS'])
|
||||
if 'CCFLAGS' in group:
|
||||
@@ -695,9 +695,9 @@ def PreBuilding():
|
||||
|
||||
def GroupLibName(name, env):
|
||||
|
||||
if rtconfig.PLATFORM == 'armcc':
|
||||
if rtconfig.PLATFORM in ['armcc']:
|
||||
return name + '_rvds'
|
||||
elif rtconfig.PLATFORM == 'gcc':
|
||||
elif rtconfig.PLATFORM in ['gcc']:
|
||||
return name + '_gcc'
|
||||
|
||||
return name
|
||||
|
||||
+5
-5
@@ -25,7 +25,7 @@ def GenerateCFiles(env,project):
|
||||
AS = os.path.join(rtconfig.EXEC_PATH, rtconfig.AS).replace('\\', "/")
|
||||
AR = os.path.join(rtconfig.EXEC_PATH, rtconfig.AR).replace('\\', "/")
|
||||
LINK = os.path.join(rtconfig.EXEC_PATH, rtconfig.LINK).replace('\\', "/")
|
||||
if rtconfig.PLATFORM == 'gcc':
|
||||
if rtconfig.PLATFORM in ['gcc']:
|
||||
SIZE = os.path.join(rtconfig.EXEC_PATH, rtconfig.SIZE).replace('\\', "/")
|
||||
OBJDUMP = os.path.join(rtconfig.EXEC_PATH, rtconfig.OBJDUMP).replace('\\', "/")
|
||||
OBJCOPY = os.path.join(rtconfig.EXEC_PATH, rtconfig.OBJCPY).replace('\\', "/")
|
||||
@@ -47,7 +47,7 @@ def GenerateCFiles(env,project):
|
||||
AS += ".exe"
|
||||
AR += ".exe"
|
||||
LINK += ".exe"
|
||||
if rtconfig.PLATFORM == 'gcc':
|
||||
if rtconfig.PLATFORM in ['gcc']:
|
||||
SIZE += ".exe"
|
||||
OBJDUMP += ".exe"
|
||||
OBJCOPY += ".exe"
|
||||
@@ -78,7 +78,7 @@ def GenerateCFiles(env,project):
|
||||
cm_file.write("SET(CMAKE_CXX_FLAGS \""+ CXXFLAGS + "\")\n")
|
||||
cm_file.write("SET(CMAKE_CXX_COMPILER_WORKS TRUE)\n\n")
|
||||
|
||||
if rtconfig.PLATFORM == 'gcc':
|
||||
if rtconfig.PLATFORM in ['gcc']:
|
||||
cm_file.write("SET(CMAKE_OBJCOPY \""+ OBJCOPY + "\")\n")
|
||||
cm_file.write("SET(CMAKE_SIZE \""+ SIZE + "\")\n\n")
|
||||
elif rtconfig.PLATFORM in ['armcc', 'armclang']:
|
||||
@@ -86,7 +86,7 @@ def GenerateCFiles(env,project):
|
||||
|
||||
LINKER_FLAGS = ''
|
||||
LINKER_LIBS = ''
|
||||
if rtconfig.PLATFORM == 'gcc':
|
||||
if rtconfig.PLATFORM in ['gcc']:
|
||||
LINKER_FLAGS += '-T'
|
||||
elif rtconfig.PLATFORM in ['armcc', 'armclang']:
|
||||
LINKER_FLAGS += '--scatter'
|
||||
@@ -126,7 +126,7 @@ def GenerateCFiles(env,project):
|
||||
cm_file.write( "\t" + path.replace("\\", "/") + "\n" )
|
||||
cm_file.write(")\n\n")
|
||||
|
||||
if rtconfig.PLATFORM == 'gcc':
|
||||
if rtconfig.PLATFORM in ['gcc']:
|
||||
cm_file.write("LINK_DIRECTORIES(\n")
|
||||
for group in project:
|
||||
if 'LIBPATH' in group.keys():
|
||||
|
||||
Reference in New Issue
Block a user