mirror of
https://github.com/drasko/codezero.git
synced 2026-07-22 07:05:24 +02:00
Removed hard coded values of toolchain and gcc cpu flags
This commit is contained in:
@@ -10,6 +10,9 @@ PROJRELROOT = '../..'
|
||||
sys.path.append(PROJRELROOT)
|
||||
|
||||
from config.projpaths import *
|
||||
from configure import *
|
||||
|
||||
config = configuration_retrieve()
|
||||
|
||||
KERNEL_INCLUDE = join(PROJROOT, 'include')
|
||||
LIBL4_RELDIR = 'conts/libl4'
|
||||
@@ -17,7 +20,7 @@ LIBL4_DIR = join(PROJROOT, LIBL4_RELDIR)
|
||||
LIBL4_INCLUDE = join(LIBL4_DIR, 'include')
|
||||
LIBL4_LIBPATH = join(BUILDDIR, LIBL4_RELDIR)
|
||||
|
||||
env = Environment(CC = 'arm-none-linux-gnueabi-gcc',
|
||||
env = Environment(CC = config.user_toolchain + 'gcc',
|
||||
CCFLAGS = ['-g', '-nostdlib', '-ffreestanding'],
|
||||
LINKFLAGS = ['-nostdlib'],
|
||||
ASFLAGS = ['-D__ASSEMBLY__'],
|
||||
|
||||
@@ -7,6 +7,9 @@ import glob
|
||||
import sys
|
||||
from os.path import join
|
||||
from string import split
|
||||
from configure import *
|
||||
|
||||
config = configuration_retrieve()
|
||||
|
||||
project_root = "../.."
|
||||
headers_root = join(project_root, "include/l4")
|
||||
@@ -33,8 +36,7 @@ test_env = Environment(CC = 'gcc -m32',
|
||||
LIBPATH = ['#'],
|
||||
CPPPATH = ['#include', join(project_root, "include"), "#", libl4_headers])
|
||||
|
||||
|
||||
env = Environment(CC = 'arm-none-linux-gnueabi-gcc',
|
||||
env = Environment(CC = config.user_toolchain + 'gcc',
|
||||
CCFLAGS = ['-g', '-nostdlib', '-Wall', '-Werror', '-ffreestanding', '-std=gnu99'],
|
||||
LINKFLAGS = ['-nostdlib'],
|
||||
ENV = {'PATH' : os.environ['PATH']},
|
||||
|
||||
Reference in New Issue
Block a user