[haiku-commits] haiku: hrev47628 - /
- From: revol@xxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 6 Aug 2014 01:08:17 +0200 (CEST)
hrev47628 adds 1 changeset to branch 'master'
old head: 14ed9dd5fcc3fe4cae399faf57fe5ffc0c28ccb6
new head: cb721c596392cbbaa63137ea292dc928a07992af
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=cb721c5+%5E14ed9dd
----------------------------------------------------------------------------
cb721c5: Add a nasm test for ELF generation
We should probably only test this when targetting x86 arch...
[ François Revol <revol@xxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev47628
Commit: cb721c596392cbbaa63137ea292dc928a07992af
URL: http://cgit.haiku-os.org/haiku/commit/?id=cb721c5
Author: François Revol <revol@xxxxxxx>
Date: Tue Aug 5 23:05:50 2014 UTC
----------------------------------------------------------------------------
1 file changed, 12 insertions(+)
configure | 12 ++++++++++++
----------------------------------------------------------------------------
diff --git a/configure b/configure
index 14dd49c..39e976a 100755
--- a/configure
+++ b/configure
@@ -760,6 +760,18 @@ if [ $HOST_PLATFORM = "darwin" ]; then
HOST_EXTENDED_REGEX_SED="sed -E"
fi
+# check if nasm can actually output ELF files
+# (the stock version in OSX can't)
+# XXX: should probably only test for x86* arch
+if [ "$("$HAIKU_NASM" -hf | grep -c ELF'[36][24]\s')" -ne "2" ]; then
+ echo "$HAIKU_NASM cannot generate ELF files. Please install a working
version."
+ if [ $HOST_PLATFORM = "darwin" ]; then
+ echo "You can install it from Mac Ports."
+ echo "Mac Ports is available at: http://www.macports.org/";
+ fi
+ exit 1
+fi
+
# create output directory
mkdir -p "$buildOutputDir" || exit 1
Other related posts:
- » [haiku-commits] haiku: hrev47628 - / - revol
