Skip to content

Commit

Permalink
[circleci] Fix building dmd - use dmd/src/build.d instead of dmd/src/…
Browse files Browse the repository at this point in the history
…posix.mak

PR dlang/dmd#10212 broke building `dmd/src/posix.mak`
with `BUILD=debug`. Use `build.d` instead.
  • Loading branch information
PetarKirov committed Aug 29, 2019
1 parent ba2195b commit de6c26e
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .circleci/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ DUB=${DUB:-dub}
N=2
CIRCLE_NODE_INDEX=${CIRCLE_NODE_INDEX:-0}
BUILD="debug"
PIC=1

case $CIRCLE_NODE_INDEX in
0) MODEL=64 ;;
Expand Down Expand Up @@ -89,7 +90,7 @@ setup_repos()
source "$(CURL_USER_AGENT=\"$CURL_USER_AGENT\" bash ~/dlang/install.sh dmd-$HOST_DMD_VER --activate)"
# build dmd and druntime
make -j$N -C ../dmd/src -f posix.mak MODEL=$MODEL HOST_DMD=$DMD BUILD=$BUILD all
pushd ../dmd && ./src/build.d MODEL=$MODEL HOST_DMD=$DMD BUILD=$BUILD PIC="$PIC" all && popd
make -j$N -C ../druntime -f posix.mak MODEL=$MODEL HOST_DMD=$DMD BUILD=$BUILD
}
Expand Down

0 comments on commit de6c26e

Please sign in to comment.