diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-07-17 08:18:45 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-07-17 08:18:45 +0200 |
| commit | db3534da1bcbf286df7ac4c8736f5c5157399ced (patch) | |
| tree | 9e65d9fe9806e794364db0cc8fe0d062b1f1cdc4 /build2/cxx/utility.cxx | |
| parent | b439803cc5e09188c7b523333f6b71de3ba57dbf (diff) | |
Redesign obj to exe/lib mapping
Specifically:
* objso{} and libso{} target types have been renamed to objs{} and libs{}
* obje{} has been added (so now we have obje{}, obja{}, and objs{})
* obje{} is now used for building exe{}
* object file extensions have been changed to use "hierarchical extensions"
that reflect the extension of the corresponding exe/lib target (instead of
the -so suffix we used), specifically:
obje{}: foo.o, (UNIX), foo.exe.o (MinGW), foo.exe.obj (Windows)
obja{}: foo.a.o (UNIX, MinGW), foo.lib.obj (Windows)
objs{}: foo.so.o (UNIX), foo.dylib.o (Darwin), foo.dll.o (MinGW),
foo.dll.obj (Windows)
Diffstat (limited to 'build2/cxx/utility.cxx')
| -rw-r--r-- | build2/cxx/utility.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build2/cxx/utility.cxx b/build2/cxx/utility.cxx index ed57fd2..cf9c4d0 100644 --- a/build2/cxx/utility.cxx +++ b/build2/cxx/utility.cxx @@ -79,7 +79,7 @@ namespace build2 for (target* t: l.prerequisite_targets) { - if (t->is_a<lib> () || t->is_a<liba> () || t->is_a<libso> ()) + if (t->is_a<lib> () || t->is_a<liba> () || t->is_a<libs> ()) append_lib_options (args, *t, var); } @@ -93,7 +93,7 @@ namespace build2 for (target* t: l.prerequisite_targets) { - if (t->is_a<lib> () || t->is_a<liba> () || t->is_a<libso> ()) + if (t->is_a<lib> () || t->is_a<liba> () || t->is_a<libs> ()) hash_lib_options (csum, *t, var); } |