switch to yasm

master
= 2017-08-31 18:20:30 -04:00
parent 2188ab8060
commit 8eb89d3657
3 changed files with 11 additions and 15 deletions

View File

@ -1,5 +1,4 @@
#! /usr/bin/env sh
apt-get install -y \
clang \
libssl-dev \
nasm
yasm

11
run.py
View File

@ -155,7 +155,6 @@ def provision():
provision = ['sudo', 'sh', 'provision-ubuntu.sh']
prov_proc = subprocess.run(provision)
os.environ['CC'] = 'clang'
waf = [sys.executable, 'waf.py', 'configure']
waf_proc = subprocess.run(waf)
@ -204,14 +203,12 @@ if __name__ == '__main__':
if args.provision:
provision()
elif args.build:
if args.build:
build()
elif args.dumps:
if args.dumps:
hex_dumps(args.dir)
else:
with Server() as server:
gen = Genorator(
server=server, parent=args.parent, seed=args.seed,
run_dir=args.dir)
gen = Genorator(server=server, parent=args.parent,
seed=args.seed, run_dir=args.dir)

10
wscript
View File

@ -1,15 +1,15 @@
#! /usr/bin/env python
# encoding: utf-8
CC = 'clang++'
#! /usr/bin/env python3
# -*- mode: python -*-
# vi: set ft=python :
def options(opt):
opt.load('nasm')
opt.load('yasm')
opt.load('compiler_cxx')
def configure(conf):
conf.load('nasm')
conf.load('yasm')
conf.load('compiler_cxx')