From: Michael Jeanson <mjeanson@efficios.com>
Date: Tue, 23 Jul 2019 21:22:17 +0000 (-0400)
Subject: jjb: babeltrace: force remap DLL addresses on Cygwin x86
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=897eb548da2a0a5a64884b2c9c9d80ecd13d2d2c;p=lttng-ci.git

jjb: babeltrace: force remap DLL addresses on Cygwin x86

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---

diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh
index 910ce3a..efc8be1 100755
--- a/scripts/babeltrace/build.sh
+++ b/scripts/babeltrace/build.sh
@@ -189,6 +189,15 @@ macosx)
     export PYTHON_CONFIG="python3-config"
     ;;
 
+cygwin)
+    export MAKE=make
+    export TAR=tar
+    export NPROC=nproc
+    export PYTHON="python3"
+    export PYTHON_CONFIG="python3-config"
+    rebase_dll=1
+    ;;
+
 *)
     export MAKE=make
     export TAR=tar
@@ -341,6 +350,11 @@ esac
 # BUILD!
 $MAKE -j "$($NPROC)" V=1
 
+# Force rebase DLL address mapping
+if [ "${rebase_dll:-}" == "1" ]; then
+	find . -name "*.dll" | xargs rebase -O -v
+fi
+
 # Install in the workspace
 $MAKE install DESTDIR="$WORKSPACE"