Skip to content

Expose HOST_DMD for druntime and phobos #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wilzbach wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Expose HOST_DMD for druntime and phobos #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 2 additions & 21 deletions src/do_build_dmd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,13 @@

. src/setup_env.sh "$2"

if [ "${2:0:7}" == "Darwin_" -o "${2:0:6}" == "Win_32" ]; then
BINDIR=bin
else
BINDIR=bin$COMPILER_MODEL
fi

echo -e "\tbuilding dmd"

top=$PWD
cd $1/dmd

# expose a prebuilt dmd
DMDVER=2.079.0
HOST_DC=`ls -1 $top/release-build/dmd-$DMDVER/*/$BINDIR/dmd$EXE`
echo "HOST_DC=$HOST_DC" >> ../dmd-build.log 2>&1

if [[ ! -z "$HOST_DC" && ( "$2" == "Win_32" || "$2" == "Win_32_64" ) ]]; then
HOST_DC=`cygpath -w $HOST_DC`
echo "HOST_DC=$HOST_DC" >> ../dmd-build.log 2>&1
fi

if [ "$makefile" == "win64.mak" ]; then
makefile=win32.mak
fi

export HOST_DC
build_step=dmd-build
. src/host-dmd_env.sh

$makecmd MAKE=$makecmd MODEL=$COMPILER_MODEL $EXTRA_ARGS -f $makefile auto-tester-build >> ../dmd-build.log 2>&1
if [ $? -ne 0 ]; then
Expand Down
4 changes: 4 additions & 0 deletions src/do_build_druntime.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,12 @@

echo -e "\tbuilding druntime"

top=$PWD
cd $1/druntime

build_step=druntime-build
. src/host-dmd_env.sh

DMD_PATH=`ls -1 ../dmd/generated/*/release/$COMPILER_MODEL/dmd$EXE`

$makecmd DMD=$DMD_PATH MODEL=$OUTPUT_MODEL $EXTRA_ARGS -f $makefile auto-tester-build >> ../druntime-build.log 2>&1
Expand Down
4 changes: 4 additions & 0 deletions src/do_build_phobos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,12 @@

echo -e "\tbuilding phobos"

top=$PWD
cd $1/phobos

build_step=phobos-build
. src/host-dmd_env.sh

DMD_PATH=`ls -1 ../dmd/generated/*/release/$COMPILER_MODEL/dmd$EXE`

$makecmd DMD=$DMD_PATH MODEL=$OUTPUT_MODEL $EXTRA_ARGS -f $makefile auto-tester-build >> ../phobos-build.log 2>&1
Expand Down
21 changes: 21 additions & 0 deletions src/host-dmd_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#!/usr/bin/env bash

logfile="../${build_step}.log"

if [ "${2:0:7}" == "Darwin_" -o "${2:0:6}" == "Win_32" ]; then
BINDIR=bin
else
BINDIR=bin$COMPILER_MODEL
fi

# expose a prebuilt dmd
DMDVER=2.079.0
HOST_DMD=`ls -1 $top/release-build/dmd-$DMDVER/*/$BINDIR/dmd$EXE`
echo "HOST_DMD=$HOST_DMD" >> "$logfile" 2>&1

if [[ ! -z "$HOST_DMD" && ( "$2" == "Win_32" || "$2" == "Win_32_64" ) ]]; then
HOST_DMD=`cygpath -w $HOST_DMD`
echo "HOST_DMD=$HOST_DMD" >> "$logfile" 2>&1
fi

export HOST_DMD