From b1f3a2bbc73f4d394d9fd390b14f1f9c2115adf4 Mon Sep 17 00:00:00 2001 From: Bahadir Balban Date: Wed, 16 Sep 2009 19:49:35 +0300 Subject: [PATCH] Removed arch symlink creation. Simply very hard to get SCons to do it. --- conts/libl4/SConscript | 14 ++++++++++---- conts/libl4/SConstruct | 5 ----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/conts/libl4/SConscript b/conts/libl4/SConscript index e0b468c..7cefdeb 100644 --- a/conts/libl4/SConscript +++ b/conts/libl4/SConscript @@ -35,14 +35,20 @@ env = Environment(CC = 'arm-none-linux-gnueabi-gcc', LIBS = 'gcc', CPPPATH = ['include', 'include/l4lib/arch', join(PROJROOT, 'include') ]) - def create_symlinks(arch): - if not os.path.exists("include/l4lib/arch"): - os.system("ln -s %s %s" % ("arch-" + arch, "include/l4lib/arch")) + print os.getcwd() + prefix = 'conts/libl4/include/l4lib' + symlink = join(prefix, 'arch') + reallink = join(prefix, 'arch-' + arch) + + if not os.path.exists(symlink): + cmd = "ln -s %s %s" % (reallink, symlink) + print cmd + os.system(cmd) # TODO: There are errors in this code that -Werror gives problems with. -create_symlinks(arch) +#create_symlinks(arch) objects = env.StaticObject(Glob('src/*.c') + Glob('src/' + arch + '/*.[cS]')) library = env.StaticLibrary('l4', objects) diff --git a/conts/libl4/SConstruct b/conts/libl4/SConstruct index b9cbb1a..8e48160 100644 --- a/conts/libl4/SConstruct +++ b/conts/libl4/SConstruct @@ -25,13 +25,8 @@ env = Environment(CC = 'arm-none-linux-gnueabi-gcc', LIBS = 'gcc', CPPPATH = ['#include', '#include/l4lib/arch', join(PROJROOT,'include') ]) -def create_symlinks(arch): - if not os.path.exists("include/l4lib/arch"): - os.system("ln -s %s %s" % ("arch-" + arch, "include/l4lib/arch")) - # TODO: There are errors in this code that -Werror gives problems with. -create_symlinks(arch) objects = env.StaticObject(Glob('src/*.c') + Glob('src/' + arch + '/*.[cS]')) library = env.StaticLibrary('l4', objects)