aboutsummaryrefslogtreecommitdiff
path: root/bpkg
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2016-08-22 16:21:14 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2016-08-22 16:21:14 +0200
commit8bdf75596de37b0e6d9e33fff27f2431af1175da (patch)
tree9a95d17f0d4a79ed62809e438340626b06f6e8d6 /bpkg
parentdbbad54d8df13014a698196c6ff50acba4d4f093 (diff)
Minor fixes and cleanups
Diffstat (limited to 'bpkg')
-rw-r--r--bpkg/buildfile6
-rw-r--r--bpkg/export4
2 files changed, 4 insertions, 6 deletions
diff --git a/bpkg/buildfile b/bpkg/buildfile
index f692910..a7ce32e 100644
--- a/bpkg/buildfile
+++ b/bpkg/buildfile
@@ -13,15 +13,13 @@ lib{bpkg}: \
$libs
cxx.poptions =+ -I$src_root
+obja{*}: cxx.poptions += -DLIBBPKG_STATIC_BUILD
+objs{*}: cxx.poptions += -DLIBBPKG_SHARED_BUILD
lib{bpkg}: cxx.export.poptions = -I$src_root
-
liba{bpkg}: cxx.export.poptions += -DLIBBPKG_STATIC
libs{bpkg}: cxx.export.poptions += -DLIBBPKG_SHARED
-obja{*}: cxx.poptions += -DLIBBPKG_STATIC_BUILD
-objs{*}: cxx.poptions += -DLIBBPKG_SHARED_BUILD
-
# Install into the bpkg/ subdirectory of, say, /usr/include/.
#
install.include = $install.include/bpkg
diff --git a/bpkg/export b/bpkg/export
index 7bbb994..63dd09c 100644
--- a/bpkg/export
+++ b/bpkg/export
@@ -7,7 +7,7 @@
// Normally we don't export class templates (but do complete specializations),
// inline functions, and classes with only inline member functions. Exporting
-// classes that inherit from non-exported/import bases (e.g., std::string)
+// classes that inherit from non-exported/imported bases (e.g., std::string)
// will end up badly. The only known workarounds are to not inherit or to not
// export. Also, MinGW GCC doesn't like seeing non-exported function being
// used before their inline definition. The workaround is to reorder code. In
@@ -30,7 +30,7 @@
# define LIBBPKG_EXPORT
# endif
#else
-// If none of the above macros are defined, then we assume we are being using
+// If none of the above macros are defined, then we assume we are being used
// by some third-party build system that cannot/doesn't signal the library
// type. Note that this fallback works for both static and shared but in case
// of shared will be sub-optimal compared to having dllimport.