diff options
Diffstat (limited to 'libbuild2/cxx')
| -rw-r--r-- | libbuild2/cxx/buildfile | 8 | ||||
| -rw-r--r-- | libbuild2/cxx/init.cxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libbuild2/cxx/buildfile b/libbuild2/cxx/buildfile index a95da97..5862bec 100644 --- a/libbuild2/cxx/buildfile +++ b/libbuild2/cxx/buildfile @@ -4,13 +4,13 @@ # NOTE: shared imports should go into root.build. # include ../ -imp_libs = ../lib{build2} # Implied interface dependency. +impl_libs = ../lib{build2} # Implied interface dependency. include ../cc/ -int_libs = ../cc/lib{build2-cc} +intf_libs = ../cc/lib{build2-cc} ./: lib{build2-cxx}: libul{build2-cxx}: {hxx ixx txx cxx}{** -**.test...} \ - $int_libs $imp_libs + $intf_libs $impl_libs # Unit tests. # @@ -52,7 +52,7 @@ if! $cross lib{build2-cxx}: { cxx.export.poptions = "-I$out_root" "-I$src_root" - cxx.export.libs = $int_libs + cxx.export.libs = $intf_libs } liba{build2-cxx}: cxx.export.poptions += -DLIBBUILD2_CXX_STATIC diff --git a/libbuild2/cxx/init.cxx b/libbuild2/cxx/init.cxx index 74dc3ed..2c5c919 100644 --- a/libbuild2/cxx/init.cxx +++ b/libbuild2/cxx/init.cxx @@ -547,13 +547,13 @@ namespace build2 vp.insert<strings> ("cxx.export.coptions"), vp.insert<strings> ("cxx.export.loptions"), vp.insert<vector<name>> ("cxx.export.libs"), - vp.insert<vector<name>> ("cxx.export.imp_libs"), + vp.insert<vector<name>> ("cxx.export.impl_libs"), vp["cc.export.poptions"], vp["cc.export.coptions"], vp["cc.export.loptions"], vp["cc.export.libs"], - vp["cc.export.imp_libs"], + vp["cc.export.impl_libs"], vp.insert<string> ("cxx.stdlib"), |