diff --git a/ci/run.sh b/ci/run.sh index d130df03ae18..c30c77fdffaa 100755 --- a/ci/run.sh +++ b/ci/run.sh @@ -61,7 +61,12 @@ build() { if [ "$OS_NAME" != "windows" ]; then source ~/dlang/*/activate # activate host compiler, incl. setting `DMD` fi - $DMD compiler/src/build.d -ofgenerated/build + BUILD_DFLAGS= + if [ "$OS_NAME" == "osx" ]; then + BUILD_DFLAGS="-L-ld_classic" + CI_DFLAGS="$CI_DFLAGS $BUILD_DFLAGS" + fi + $DMD compiler/src/build.d -ofgenerated/build $BUILD_DFLAGS generated/build -j$N MODEL=$MODEL HOST_DMD=$DMD DFLAGS="$CI_DFLAGS" BUILD=debug unittest generated/build -j$N MODEL=$MODEL HOST_DMD=$DMD DFLAGS="$CI_DFLAGS" ENABLE_RELEASE=1 dmd make -j$N -C druntime MODEL=$MODEL diff --git a/compiler/src/build.d b/compiler/src/build.d index 8e9ccd4dfa85..fe708cbc2ca2 100755 --- a/compiler/src/build.d +++ b/compiler/src/build.d @@ -1002,6 +1002,9 @@ alias toolchainInfo = makeRule!((builder, rule) => builder app.put("==== Toolchain Information ====\n"); + version (OSX) + show("OS", ["sw_vers"]); + version (Windows) show("SYSTEM", ["systeminfo"]); else diff --git a/compiler/src/dmd/backend/machobj.d b/compiler/src/dmd/backend/machobj.d index 305c91991ff1..8308adccad85 100644 --- a/compiler/src/dmd/backend/machobj.d +++ b/compiler/src/dmd/backend/machobj.d @@ -1426,6 +1426,7 @@ void MachObj_term(const(char)* objfilename) sym32.n_sect = sym.n_sect; fobjbuf.write(&sym32, sym32.sizeof); } + dysymtab_cmd.nundefsym++; symtab_cmd.nsyms++; } foffset += symtab_cmd.nsyms * (I64 ? nlist_64.sizeof : nlist.sizeof);