Merge branch 'master' of https://github.com/RT-Thread/rt-thread
This commit is contained in:
commit
0826efaab3
|
@ -264,6 +264,9 @@ int dfs_ramfs_open(struct dfs_fd *file)
|
||||||
|
|
||||||
file->data = dirent;
|
file->data = dirent;
|
||||||
file->size = dirent->size;
|
file->size = dirent->size;
|
||||||
|
if (file->flags & DFS_O_APPEND)
|
||||||
|
file->pos = file->size;
|
||||||
|
else
|
||||||
file->pos = 0;
|
file->pos = 0;
|
||||||
|
|
||||||
return DFS_STATUS_OK;
|
return DFS_STATUS_OK;
|
||||||
|
|
|
@ -50,6 +50,11 @@ def PrepareBuilding(env, root_directory, has_libcpu=False, remove_components = [
|
||||||
rtconfig.EXEC_PATH = rtconfig.EXEC_PATH.replace('bin40', 'armcc/bin')
|
rtconfig.EXEC_PATH = rtconfig.EXEC_PATH.replace('bin40', 'armcc/bin')
|
||||||
Env['LINKFLAGS']=Env['LINKFLAGS'].replace('RV31', 'armcc')
|
Env['LINKFLAGS']=Env['LINKFLAGS'].replace('RV31', 'armcc')
|
||||||
|
|
||||||
|
# reset AR command flags
|
||||||
|
env['ARCOM'] = '$AR --create $TARGET $SOURCES'
|
||||||
|
env['LIBPREFIX'] = ''
|
||||||
|
env['LIBSUFFIX'] = '_rvds.lib'
|
||||||
|
|
||||||
# patch for win32 spawn
|
# patch for win32 spawn
|
||||||
if env['PLATFORM'] == 'win32' and rtconfig.PLATFORM == 'gcc':
|
if env['PLATFORM'] == 'win32' and rtconfig.PLATFORM == 'gcc':
|
||||||
win32_spawn = Win32Spawn()
|
win32_spawn = Win32Spawn()
|
||||||
|
@ -269,6 +274,7 @@ def DefineGroup(name, src, depend, **parameters):
|
||||||
|
|
||||||
group = parameters
|
group = parameters
|
||||||
group['name'] = name
|
group['name'] = name
|
||||||
|
group['path'] = GetCurrentDir()
|
||||||
if type(src) == type(['src1', 'str2']):
|
if type(src) == type(['src1', 'str2']):
|
||||||
group['src'] = File(src)
|
group['src'] = File(src)
|
||||||
else:
|
else:
|
||||||
|
@ -327,7 +333,6 @@ def DoBuilding(target, objects):
|
||||||
# check whether special buildlib option
|
# check whether special buildlib option
|
||||||
lib_name = GetOption('buildlib')
|
lib_name = GetOption('buildlib')
|
||||||
if lib_name:
|
if lib_name:
|
||||||
print lib_name
|
|
||||||
# build library with special component
|
# build library with special component
|
||||||
for Group in Projects:
|
for Group in Projects:
|
||||||
if Group['name'] == lib_name:
|
if Group['name'] == lib_name:
|
||||||
|
|
Loading…
Reference in New Issue