diff options
| author | Chris Dickens <christopher.a.dickens@gmail.com> | 2015-12-03 12:59:20 -0800 |
|---|---|---|
| committer | Chris Dickens <christopher.a.dickens@gmail.com> | 2015-12-17 01:02:08 -0800 |
| commit | 3dc781ce3ecd0315cfc0b4fdcef9e062990f289b (patch) | |
| tree | f9aa1375680d3f8badc36d4b0986fb50f2b161fc /bootstrap.sh | |
| parent | a6db382ad11f7662b550338e0570d5a2dfd8ce5a (diff) | |
| download | libusb-3dc781ce3ecd0315cfc0b4fdcef9e062990f289b.tar.gz | |
Misc: Simplify Haiku build and fix broken parallel build
The Haiku build was previously being done as a nested package
due to its C++ requirement, but for some reason setting SUBDIR
in an automake conditional breaks parallel builds. To fix this
and simplify the Haiku build process, this commit adds an
unconditional check for a C++ compiler using AC_PROG_CXX and
builds the Haiku sources as part of the main libusb project.
Note that AC_PROG_CXX itself does not cause the configure script
to fail if a C++ compiler is not found. Therefore on non-Haiku
platforms there is no requirement to have a C++ compiler installed
in order to build libusb.
Closes #121
Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
Diffstat (limited to 'bootstrap.sh')
| -rwxr-xr-x | bootstrap.sh | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/bootstrap.sh b/bootstrap.sh index 506440b..8b2b2c0 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -12,14 +12,6 @@ else exit 1 fi -# run autotools on haiku package -cd libusb/os/haiku || exit 1 -$LIBTOOLIZE --copy --force || exit 1 -aclocal || exit 1 -autoconf || exit 1 -automake -a -c || exit 1 -cd ../../.. - $LIBTOOLIZE --copy --force || exit 1 aclocal || exit 1 autoheader || exit 1 |