jyapayne/llvmpy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tweak setup-win32.py to work with structure of LLVM as installed

Browse source 
The PACKAGE target created by the cmake build makes an
nsis installer with a particular directory structure.
This change targets that structure.
This commit is contained in:
Mark Wiebe 2012-08-21 10:55:55 -07:00
commit 31601e03cf
1 changed files with 11 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

29
setup-win32.py
View file

@ -94,29 +94,22 @@ LLVMX86Info
def get_llvm_config(): def get_llvm_config():
# get from command-line, or use default # get from command-line, or use default
llvm_dir = '../llvm-2.9' llvm_dir = r'C:\Program Files\LLVM 3.1.1'
llvm_build_dir = None
i = 0 i = 0
while i < len(sys.argv): while i < len(sys.argv):
arg = sys.argv[i] arg = sys.argv[i]
if arg.startswith('--llvm-dir='): if arg.startswith('--llvm-dir='):
del sys.argv[i] del sys.argv[i]
llvm_dir = arg.split('=')[1] llvm_dir = arg.split('=')[1]
elif arg.startswith('--llvm-build-dir='):
del sys.argv[i]
llvm_build_dir = arg.split('=')[1]
else: else:
i += 1 i += 1
if llvm_build_dir is None: good = os.path.isdir( llvm_dir )
llvm_build_dir = os.path.join( llvm_dir, 'build' ) return (llvm_dir, good)
good = os.path.isdir( llvm_dir ) and os.path.isdir( llvm_build_dir )
return (llvm_dir, llvm_build_dir, good)
def call_setup(llvm_dir, llvm_build_dir): def call_setup(llvm_dir):
incdirs = [os.path.join( llvm_dir, 'include' ), incdirs = [os.path.join(llvm_dir, 'include')]
os.path.join( llvm_build_dir, 'include') ] libdir = os.path.join(llvm_dir, 'lib')
libdir = os.path.join( llvm_build_dir, 'lib', 'Release' )
libs_core, objs_core = get_libs_and_objs(libdir) libs_core, objs_core = get_libs_and_objs(libdir)
std_libs = [] std_libs = []
@ -144,15 +137,15 @@ def call_setup(llvm_dir, llvm_build_dir):
def main(): def main():
# get llvm config # get llvm config
llvm_dir, llvm_build_dir, is_good = get_llvm_config() llvm_dir, is_good = get_llvm_config()
print("Using llvm-dir=" + llvm_dir + " and llvm-build-dir=" + llvm_build_dir) print("Using llvm-dir=" + llvm_dir)
if not is_good: if not is_good:
print("Cannot find llvm-dir or llvm-build-dir") print("Cannot find llvm-dir")
print("Try again with --llvm-dir=/path/to/llvm-top-dir --llvm-build-dir=/path/to/llvm/cmake/dir.") print("Try again with --llvm-dir=/path/to/llvm-top-dir.")
return 1 return 1
# setup # setup
call_setup(llvm_dir, llvm_build_dir) call_setup(llvm_dir)
# done # done
return 0 return 0