diff options
Diffstat (limited to 'CC/foreign/make/EXPRESSIONS')
| -rw-r--r-- | CC/foreign/make/EXPRESSIONS | 59 |
1 files changed, 54 insertions, 5 deletions
diff --git a/CC/foreign/make/EXPRESSIONS b/CC/foreign/make/EXPRESSIONS index 36ac152..bf72594 100644 --- a/CC/foreign/make/EXPRESSIONS +++ b/CC/foreign/make/EXPRESSIONS @@ -41,6 +41,11 @@ , "default-TOOLCHAIN": ["CC", "default-TOOLCHAIN"] , "default-NON_SYSTEM_TOOLS": ["CC", "default-NON_SYSTEM_TOOLS"] , "expand_exec_tool": ["./", "..", "expand_exec_tool"] + , "foreign-MAKE": ["CC/foreign", "default-MAKE"] + , "foreign-ENV": ["CC/foreign", "default-ENV"] + , "foreign-PATH": ["CC/foreign", "default-PATH"] + , "foreign-TOOLCHAIN": ["CC/foreign", "default-TOOLCHAIN"] + , "foreign-NON_SYSTEM_TOOLS": ["CC/foreign", "default-NON_SYSTEM_TOOLS"] } , "expression": { "type": "let*" @@ -56,7 +61,15 @@ } ] , ["TOOLCHAIN_DIR", "toolchain"] - , ["TOOLCHAIN", {"type": "CALL_EXPRESSION", "name": "default-TOOLCHAIN"}] + , [ "TOOLCHAIN" + , { "type": "disjoint_map_union" + , "msg": "Toolchain trees may not overlap" + , "$1": + [ {"type": "CALL_EXPRESSION", "name": "foreign-TOOLCHAIN"} + , {"type": "CALL_EXPRESSION", "name": "default-TOOLCHAIN"} + ] + } + ] , [ "TOOLCHAIN" , { "type": "to_subdir" , "subdir": {"type": "var", "name": "TOOLCHAIN_DIR"} @@ -64,7 +77,30 @@ } ] , [ "NON_SYSTEM_TOOLS" - , {"type": "CALL_EXPRESSION", "name": "default-NON_SYSTEM_TOOLS"} + , { "type": "map_union" + , "$1": + [ {"type": "CALL_EXPRESSION", "name": "foreign-NON_SYSTEM_TOOLS"} + , {"type": "CALL_EXPRESSION", "name": "default-NON_SYSTEM_TOOLS"} + ] + } + ] + , [ "MAKE" + , { "type": "join" + , "$1": + { "type": "++" + , "$1": + [ { "type": "if" + , "cond": + { "type": "lookup" + , "key": "MAKE" + , "map": {"type": "var", "name": "NON_SYSTEM_TOOLS"} + } + , "then": ["./", {"type": "var", "name": "TOOLCHAIN_DIR"}, "/"] + } + , {"type": "CALL_EXPRESSION", "name": "foreign-MAKE"} + ] + } + } ] , ["CC", {"type": "CALL_EXPRESSION", "name": "compiler-cc"}] , ["CXX", {"type": "CALL_EXPRESSION", "name": "compiler-cxx"}] @@ -150,9 +186,18 @@ , "$1": [ { "type": "env" , "vars": - ["CC", "CXX", "CFLAGS", "CXXFLAGS", "LDFLAGS", "AR", "PREFIX"] + [ "CC" + , "CXX" + , "CFLAGS" + , "CXXFLAGS" + , "LDFLAGS" + , "AR" + , "MAKE" + , "PREFIX" + ] } , {"type": "CALL_EXPRESSION", "name": "default-ENV"} + , {"type": "CALL_EXPRESSION", "name": "foreign-ENV"} , {"type": "var", "name": "ENV", "default": {"type": "empty_map"}} ] } @@ -203,6 +248,7 @@ , "export DESTDIR=\"$(pwd)/install\"" , "export TOOLCHAIN=\"$(pwd)/toolchain\"" , "export LOCALBASE=\"$(pwd)/localbase\"" + , "export MAKE=$([ -x \"${MAKE}\" ] && realpath ${MAKE} || echo ${MAKE})" , { "type": "join" , "$1": [ "export PATH=\"$(./expand_exec TOOLCHAIN -- echo " @@ -246,12 +292,15 @@ , "var": "target" , "body": { "type": "join" + , "separator": " " , "$1": - [ "${ROOT}/expand_exec TMPDIR DESTDIR LOCALBASE CC CXX CFLAGS CXXFLAGS LDFLAGS AR PREFIX -- make DESTDIR=${DESTDIR} -C \"source/${SUBDIR}\" \"$@\" " + [ "${ROOT}/expand_exec TMPDIR DESTDIR LOCALBASE CC CXX CFLAGS CXXFLAGS LDFLAGS AR PREFIX" + , "--" + , "${MAKE} -C \"source/${SUBDIR}\" DESTDIR=${DESTDIR} \"$@\"" , { "type": "join_cmd" , "$1": [{"type": "var", "name": "target"}] } - , " >>build.log 2>&1 || (cat build.log && exit 1)" + , ">>build.log 2>&1 || (cat build.log && exit 1)" ] } } |