diff options
| author | Lukas Larsson <[email protected]> | 2014-01-14 18:25:44 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-01-14 18:29:22 +0100 |
| commit | 139a226d7a927dc46dea312d60b4beed75516bcd (patch) | |
| tree | 688162ffd73ed9c0cc5a3f05c2e469043486c80e /erts | |
| parent | 615f45929df6ed4689904c3c463d11640cda2cde (diff) | |
| download | otp-139a226d7a927dc46dea312d60b4beed75516bcd.tar.gz otp-139a226d7a927dc46dea312d60b4beed75516bcd.tar.bz2 otp-139a226d7a927dc46dea312d60b4beed75516bcd.zip | |
cerl: Fix target detection on freebsd
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/etc/unix/cerl.src | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/erts/etc/unix/cerl.src b/erts/etc/unix/cerl.src index be8343e87e..78fefbea55 100644 --- a/erts/etc/unix/cerl.src +++ b/erts/etc/unix/cerl.src @@ -86,6 +86,7 @@ run_valgrind=no # Default rootdir ROOTDIR=%SRC_ROOTDIR% BINDIR="$ROOTDIR/bin/`$ROOTDIR/erts/autoconf/config.guess`" +TARGET=%TARGET% #BINDIR="$ROOTDIR/bin/%TARGET%" PROGNAME=$ROOTDIR/bin/cerl EMU=beam @@ -248,6 +249,12 @@ while [ $# -gt 0 ]; do done +if [ ! -f $BINDIR/erlexec -a -f $ROOTDIR/bin/$TARGET/erlexec ]; then + # We are in a strange target (I'm looking at you openbsd) where + # TARGET != config.guess + BINDIR=$ROOTDIR/bin/$TARGET +fi + PATH=$BINDIR:$ROOTDIR/bin:$PATH EXEC=$BINDIR/erlexec |