diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2011-10-09 07:27:06 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2011-10-09 07:27:06 -0700 |
| commit | 8c35202927a7cd8f14b219e4949195e1e6bc6946 (patch) | |
| tree | 2cc79d36f916c220b3bc449cba4d3ab602f534c4 /settings.py | |
| parent | efaf3590ac33702eeff423e31e85f690b1fc7eb2 (diff) | |
| parent | 06354eda6092add55034c692bd65734a61083e8b (diff) | |
Merge branch 'llvm-svn'
Conflicts:
src/dlmalloc.c
tests/dlmalloc.c
tests/runner.py
tools/shared.py
Diffstat (limited to 'settings.py')
| -rw-r--r-- | settings.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/settings.py b/settings.py index c6d63341..ab9619a9 100644 --- a/settings.py +++ b/settings.py @@ -7,11 +7,7 @@ TEMP_DIR='/dev/shm' LLVM_ROOT=os.path.expanduser('~/Dev/llvm-2.9/cbuild/bin') -LLVM_GCC=os.path.expanduser('~/Dev/llvm-gcc-2.9/cbuild/install/bin/llvm-g++') - -COMPILER_OPTS = ['-m32'] # Need to build as 32bit arch, for now - - # various errors on 64bit compilation - # WARNING: '-g' here will generate llvm bitcode that lli will crash on! +COMPILER_OPTS = [] SPIDERMONKEY_ENGINE = [os.path.expanduser('~/Dev/mozilla-central/js/src/js'), '-m', '-n'] V8_ENGINE = [os.path.expanduser('~/Dev/v8/d8')] |