diff options
| author | Greg Clayton <gclayton@apple.com> | 2011-04-07 22:46:35 +0000 |
|---|---|---|
| committer | Greg Clayton <gclayton@apple.com> | 2011-04-07 22:46:35 +0000 |
| commit | eb0103f2d08a13812614da6f4dc3f6bb80c7aa21 (patch) | |
| tree | dbf5eb8c26e985bc82f53cb4030cee1f0bbfba11 /lldb/scripts | |
| parent | 165a07adf94e4b81e7ed110158688b1426fe9f76 (diff) | |
| download | bcm5719-llvm-eb0103f2d08a13812614da6f4dc3f6bb80c7aa21.tar.gz bcm5719-llvm-eb0103f2d08a13812614da6f4dc3f6bb80c7aa21.zip | |
Modified the ArchSpec to take an optional "Platform *" when setting the triple.
This allows you to have a platform selected, then specify a triple using
"i386" and have the remaining triple items (vendor, os, and environment) set
automatically.
Many interpreter commands take the "--arch" option to specify an architecture
triple, so now the command options needed to be able to get to the current
platform, so the Options class now take a reference to the interpreter on
construction.
Modified the build LLVM building in the Xcode project to use the new
Xcode project level user definitions:
LLVM_BUILD_DIR - a path to the llvm build directory
LLVM_SOURCE_DIR - a path to the llvm sources for the llvm that will be used to build lldb
LLVM_CONFIGURATION - the configuration that lldb is built for (Release,
Release+Asserts, Debug, Debug+Asserts).
I also changed the LLVM build to not check if "lldb/llvm" is a symlink and
then assume it is a real llvm build directory versus the unzipped llvm.zip
package, so now you can actually have a "lldb/llvm" directory in your lldb
sources.
llvm-svn: 129112
Diffstat (limited to 'lldb/scripts')
| -rw-r--r-- | lldb/scripts/build-llvm.pl | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lldb/scripts/build-llvm.pl b/lldb/scripts/build-llvm.pl index 8aff1101e80..3ada7ce6c2f 100644 --- a/lldb/scripts/build-llvm.pl +++ b/lldb/scripts/build-llvm.pl @@ -13,7 +13,8 @@ use File::Basename; use File::Glob ':glob'; use List::Util qw[min max]; -our $llvm_dstroot = $ENV{SCRIPT_INPUT_FILE_0}; +our $llvm_srcroot = $ENV{SCRIPT_INPUT_FILE_0}; +our $llvm_dstroot = $ENV{SCRIPT_INPUT_FILE_1}; our $libedis_outfile = $ENV{SCRIPT_OUTPUT_FILE_0}; our ($libedis_basename, $libedis_dirname) = fileparse ($libedis_outfile); @@ -27,8 +28,6 @@ our $llvm_configuration = $ENV{LLVM_CONFIGURATION}; our $llvm_revision = "128303"; our $llvm_source_dir = "$ENV{SRCROOT}"; -our $cc = "$ENV{DEVELOPER_BIN_DIR}/gcc-4.2"; -our $cxx = "$ENV{DEVELOPER_BIN_DIR}/g++-4.2"; our @archs = split (/\s+/, $ENV{ARCHS}); our @archive_files = ( @@ -84,7 +83,7 @@ our @archive_files = ( "$llvm_configuration/lib/libLLVMX86Utils.a", ); -if (-l $llvm_dstroot) +if (-e "$llvm_srcroot/lib") { print "Using standard LLVM build directory...\n"; # LLVM in the "lldb" root is a symlink which indicates we are using a @@ -230,7 +229,7 @@ sub build_llvm print "Configuring clang ($arch) in '$llvm_dstroot_arch'...\n"; my $lldb_configuration_options = ''; $llvm_configuration eq 'Release' and $lldb_configuration_options .= '--enable-optimized --disable-assertions'; - do_command ("cd '$llvm_dstroot_arch' && '$llvm_source_dir/llvm/configure' $lldb_configuration_options --enable-targets=x86_64,arm --build=$arch-apple-darwin10 CC=\"$cc -arch $arch\" CXX=\"$cxx -arch $arch\"", + do_command ("cd '$llvm_dstroot_arch' && '$llvm_source_dir/llvm/configure' $lldb_configuration_options --enable-targets=x86_64,arm --build=$arch-apple-darwin10", "configuring llvm build", 1); } |
