diff options
Diffstat (limited to 'JavaScriptCore/wscript')
| -rw-r--r-- | JavaScriptCore/wscript | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/JavaScriptCore/wscript b/JavaScriptCore/wscript index 61ad1fb..99859f0 100644 --- a/JavaScriptCore/wscript +++ b/JavaScriptCore/wscript @@ -29,7 +29,7 @@ import commands from settings import * -jscore_excludes = ['jsc.cpp', 'ucptable.cpp'] +jscore_excludes = ['jsc.cpp', 'ucptable.cpp','ProfilerServer.mm'] jscore_excludes.extend(get_excludes(jscore_dir, ['*Brew.cpp', '*CF.cpp', '*Symbian.cpp'])) sources = [] @@ -55,8 +55,14 @@ def generate_jscore_derived_sources(): olddir = os.getcwd() os.chdir(derived_sources_dir) + # DerivedSources.make expects Cygwin (i.e. Unix-style) python, so use that instead. + if building_on_win32: + oldpath = os.environ["PATH"] + os.environ["PATH"] = "/usr/bin" + os.pathsep + os.environ["PATH"] command = 'make -f %s/DerivedSources.make JavaScriptCore=%s BUILT_PRODUCTS_DIR=%s all FEATURE_DEFINES="%s"' % (js_dir, js_dir, js_dir, ' '.join(feature_defines)) os.system(command) + if building_on_win32: + os.environ["PATH"] = oldpath os.chdir(olddir) def set_options(opt): @@ -86,6 +92,7 @@ def build(bld): install_path = output_dir) jscore.find_sources_in_dirs(full_dirs, excludes = jscore_excludes) + obj = bld.new_task_gen( features = 'cxx cprogram', |