mirrors/dmd
1
0
Fork 0
mirror of https://github.com/dlang/dmd.git synced 2025-04-26 21:21:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

build: Fix bootstrap script for FreeBSD

Browse source
This commit is contained in:
Iain Buclaw 2020-11-19 16:19:50 +01:00 • committed by Mathias LANG
parent 678fca1ac7
commit 79413aba10
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/bootstrap.sh
View file

@ -34,7 +34,7 @@ if [ "$uname_s" == "Darwin" ] ; then
elif [ "$uname_s" == "Linux" ] ; then elif [ "$uname_s" == "Linux" ] ; then
OS=linux OS=linux
MODEL_PATH="bin${MODEL}" MODEL_PATH="bin${MODEL}"
elif [ "$uname_s" == "FreBSD" ] ; then elif [ "$uname_s" == "FreeBSD" ] ; then
OS=freebsd OS=freebsd
MODEL_PATH="bin${MODEL}" MODEL_PATH="bin${MODEL}"
else else
@ -43,8 +43,13 @@ else
fi fi
HOST_DMD_ROOT="${GENERATED}/host_dmd-${HOST_DMD_VER}" HOST_DMD_ROOT="${GENERATED}/host_dmd-${HOST_DMD_VER}"
# dmd.2.088.0.osx.zip or dmd.2.088.0.linux.tar.xz if [ "$OS" == "freebsd" ] ; then
HOST_DMD_BASENAME=dmd.${HOST_DMD_VER}.${OS} # dmd.2.088.0.freebsd-64.tar.xz
HOST_DMD_BASENAME=dmd.${HOST_DMD_VER}.${OS}-${MODEL}
else
# dmd.2.088.0.osx.zip or dmd.2.088.0.linux.tar.xz
HOST_DMD_BASENAME=dmd.${HOST_DMD_VER}.${OS}
fi
# http://downloads.dlang.org/releases/2.x/2.088.0/dmd.2.088.0.linux.tar.xz # http://downloads.dlang.org/releases/2.x/2.088.0/dmd.2.088.0.linux.tar.xz
HOST_DMD_URL=http://downloads.dlang.org/releases/2.x/${HOST_DMD_VER}/${HOST_DMD_BASENAME} HOST_DMD_URL=http://downloads.dlang.org/releases/2.x/${HOST_DMD_VER}/${HOST_DMD_BASENAME}
HOST_RDMD="${HOST_DMD_ROOT}/dmd2/${OS}/${MODEL_PATH}/rdmd" HOST_RDMD="${HOST_DMD_ROOT}/dmd2/${OS}/${MODEL_PATH}/rdmd"

2
src/build.d
View file

@ -1077,7 +1077,7 @@ void parseEnvironment()
auto hostDMDVer = env.getDefault("HOST_DMD_VER", "2.088.0"); auto hostDMDVer = env.getDefault("HOST_DMD_VER", "2.088.0");
writefln("Using Bootstrap compiler: %s", hostDMDVer); writefln("Using Bootstrap compiler: %s", hostDMDVer);
auto hostDMDRoot = env["G"].buildPath("host_dmd-"~hostDMDVer); auto hostDMDRoot = env["G"].buildPath("host_dmd-"~hostDMDVer);
auto hostDMDBase = hostDMDVer~"."~os; auto hostDMDBase = hostDMDVer~"."~(os == "freebsd" ? os~"-"~model : os);
auto hostDMDURL = "http://downloads.dlang.org/releases/2.x/"~hostDMDVer~"/dmd."~hostDMDBase; auto hostDMDURL = "http://downloads.dlang.org/releases/2.x/"~hostDMDVer~"/dmd."~hostDMDBase;
env["HOST_DMD"] = hostDMDRoot.buildPath("dmd2", os, os == "osx" ? "bin" : "bin"~model, "dmd"); env["HOST_DMD"] = hostDMDRoot.buildPath("dmd2", os, os == "osx" ? "bin" : "bin"~model, "dmd");
env["HOST_DMD_PATH"] = env["HOST_DMD"]; env["HOST_DMD_PATH"] = env["HOST_DMD"];