Commit 81e52d826002ae45493c200c659b3fd2798bbc46
1 parent
5ac7a05a
fix linux construction
Showing
1 changed file
with
8 additions
and
7 deletions
Show diff stats
anubis_dev/vm/SConstruct
| ... | ... | @@ -292,11 +292,12 @@ if gui == 1: |
| 292 | 292 | all_anbexec_objs += graph_obj |
| 293 | 293 | |
| 294 | 294 | all_launcher_objs = launcher_obj + share_obj + cipher_obj |
| 295 | -if strip != 0: | |
| 295 | + | |
| 296 | +if strip == 1: | |
| 296 | 297 | print 'STRIP = ', strip, type(strip) |
| 297 | - anbexec = env.Command('anbexec', vm_output_name, '%s -o $TARGET $SOURCE' % stripTool) | |
| 298 | + vm = env.Command('', vm_output_name, '%s $SOURCE' % stripTool) | |
| 298 | 299 | |
| 299 | -anbexec = env.Program(vm_output_name, all_anbexec_objs) | |
| 300 | +vm = env.Program(vm_output_name, all_anbexec_objs) | |
| 300 | 301 | launcher = env.Program('anbexec', all_launcher_objs) |
| 301 | 302 | |
| 302 | 303 | if env['PLATFORM'] == 'win32': |
| ... | ... | @@ -313,14 +314,14 @@ else: |
| 313 | 314 | #env.Install(installPath, sqlapi_so) |
| 314 | 315 | #env.Install(binDir, sqlapi_so) |
| 315 | 316 | |
| 316 | -env.Install(installPath, anbexec) | |
| 317 | +env.Install(installPath, vm) | |
| 317 | 318 | env.Install(installPath, launcher) |
| 318 | -env.Install(binDir, anbexec) | |
| 319 | +env.Install(binDir, vm) | |
| 319 | 320 | env.Install(binDir, launcher) |
| 320 | 321 | env.Alias('install', [installPath, binDir]) |
| 321 | 322 | |
| 322 | -env.Alias('all', [anbexec, launcher, 'install']) | |
| 323 | -env.Alias('vm', [anbexec, launcher]) | |
| 323 | +env.Alias('all', [vm, launcher, 'install']) | |
| 324 | +env.Alias('vm', [vm, launcher]) | |
| 324 | 325 | print 'BINDIR=', binDir |
| 325 | 326 | |
| 326 | 327 | Default('all') | ... | ... |