FWGS/waf
2
0
Fork 0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-11-25 19:30:04 +01:00
Code Issues Projects Releases Wiki Activity

extras: c_emscripten: use emar as AR

Browse Source
This commit is contained in:
Jérôme Carretero 2015-08-07 08:49:40 -04:00
parent 6ca1c7cad4
commit c913b779f5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
waflib/extras/c_emscripten.py
View File

@ -4,7 +4,7 @@
import os, subprocess, shlex import os, subprocess, shlex
from waflib import Logs from waflib import Logs
from waflib.Tools import ccroot, ar, gcc, gxx from waflib.Tools import ccroot, gcc, gxx
from waflib.Configure import conf from waflib.Configure import conf
from waflib.TaskGen import after_method, feature from waflib.TaskGen import after_method, feature
@ -62,6 +62,7 @@ def find_emscripten(conf):
cxx = conf.find_program(['em++'], var='CXX') cxx = conf.find_program(['em++'], var='CXX')
conf.env.CXX = cxx conf.env.CXX = cxx
conf.env.CXX_NAME = 'emscripten' conf.env.CXX_NAME = 'emscripten'
conf.find_program(['emar'], var='AR')
def configure(conf): def configure(conf):
conf.find_emscripten() conf.find_emscripten()
@ -73,6 +74,7 @@ def configure(conf):
conf.cxx_load_tools() conf.cxx_load_tools()
conf.cxx_add_flags() conf.cxx_add_flags()
conf.link_add_flags() conf.link_add_flags()
conf.env.ARFLAGS = ['rcs']
conf.env.cshlib_PATTERN = '%s.js' conf.env.cshlib_PATTERN = '%s.js'
conf.env.cxxshlib_PATTERN = '%s.js' conf.env.cxxshlib_PATTERN = '%s.js'
conf.env.cstlib_PATTERN = '%s.bc' conf.env.cstlib_PATTERN = '%s.bc'