Skip to content

Second round of makefile/build.d consolidation #10212

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

Merged
dlang-bot merged 2 commits into from
Aug 27, 2019
Merged

Second round of makefile/build.d consolidation #10212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66b0ede
Second round of makefile/build.d consolidation
marler8997 Jul 29, 2019
46b13c0
Merge branch 'master' into makefileRemovals2
thewilsonator Aug 27, 2019
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
67 changes: 50 additions & 17 deletions src/build.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,10 +236,10 @@ DFLAGS=-I%@P%/../../../../../druntime/import -I%@P%/../../../../../phobos -L-L%@
});

/// Returns: the dependencies that build the D backend
alias dBackend = memoize!(function () {
alias backendObj = memoize!(function () {
Dependency dependency = {
name: "dbackend",
target: env["G"].buildPath("dbackend").objName,
name: "backendObj",
target: env["G"].buildPath("backend").objName,
sources: sources.backend,
msg: "(DC) D_BACK_OBJS %-(%s, %)".format(sources.backend.map!(e => e.baseName).array),
command: [
Expand All @@ -258,9 +258,9 @@ alias backend = memoize!(function() {
Dependency dependency = {
name: "backend",
msg: "(LIB) %s".format("BACKEND".libName),
sources: [ env["G"].buildPath("dbackend").objName ],
sources: [ env["G"].buildPath("backend").objName ],
target: env["G"].buildPath("backend").libName,
deps: [dBackend],
deps: [backendObj],
command: [env["HOST_DMD_RUN"], env["MODEL_FLAG"], "-lib", "-of$@", "$<"]
};
return new DependencyRef(dependency);
Expand Down Expand Up @@ -312,11 +312,12 @@ Params:
*/
alias dmdExe = memoize!(function(string targetSuffix, string[] extraFlags...) {
// Main DMD build dependency
const dmdSources = sources.dmd.chain(sources.root).array;
Dependency dependency = {
// newdelete.o + lexer.a + backend.a
sources: sources.dmd.chain(sources.root, lexer.targets, backend.targets).array,
sources: dmdSources.chain(lexer.targets, backend.targets).array,
target: env["DMD_PATH"] ~ targetSuffix,
msg: "(DC) DMD%s %-(%s, %)".format(targetSuffix, sources.dmd.map!(e => e.baseName).array),
msg: "(DC) DMD%s %-(%s, %)".format(targetSuffix, dmdSources.map!(e => e.baseName).array),
deps: [versionFile, sysconfDirFile, lexer, backend],
command: [
env["HOST_DMD_RUN"],
Expand Down Expand Up @@ -497,6 +498,31 @@ struct DependencyRange
/// Sets the environment variables
void parseEnvironment()
{
// This block is temporary until we can remove the windows make files
{
const ddebug = env.get("DDEBUG", null);
if (ddebug.length)
{
writefln("WARNING: the DDEBUG variable is deprecated");
if (ddebug == "-debug -g -unittest -cov")
{
environment["ENABLE_DEBUG"] = "1";
environment["ENABLE_UNITTEST"] = "1";
environment["ENABLE_COVERAGE"] = "1";
}
else if (ddebug == "-debug -g -unittest")
{
environment["ENABLE_DEBUG"] = "1";
environment["ENABLE_UNITTEST"] = "1";
}
else
{
writefln("Error: DDEBUG is not an expected value '%s'", ddebug);
exit(1);
}
}
}

env.getDefault("TARGET_CPU", "X86");
version (Windows)
{
Expand Down Expand Up @@ -730,16 +756,23 @@ auto sourceFiles()
.map!(e => e.name)
.filter!(e => !lexerRootFiles.canFind(e.baseName.stripExtension))
.array,
backend:
dirEntries(env["C"], "*.d", SpanMode.shallow)
.map!(e => e.name)
.filter!(e => !e.baseName.among("dt.d", "obj.d"))
.array,
backendHeaders: [
// can't be built with -betterC
"dt",
"obj",
].map!(e => env["C"].buildPath(e ~ ".d")).array,
backend: ("
bcomplex.d evalu8.d divcoeff.d dvec.d go.d gsroa.d glocal.d gdag.d gother.d gflow.d
out.d
gloop.d compress.d cgelem.d cgcs.d ee.d cod4.d cod5.d nteh.d blockopt.d mem.d cg.d cgreg.d
dtype.d debugprint.d fp.d symbol.d elem.d dcode.d cgsched.d cg87.d cgxmm.d cgcod.d cod1.d cod2.d
cod3.d cv8.d dcgcv.d pdata.d util2.d var.d md5.d backconfig.d ph2.d drtlsym.d dwarfeh.d ptrntab.d
dvarstats.d dwarfdbginf.d cgen.d os.d goh.d barray.d cgcse.d elpicpie.d
machobj.d elfobj.d
".split
~ ( (env["OS"] == "windows") ? "cgobj.d filespec.d mscoffobj.d newman.d".split : ["aarray.d"] )
).map!(e => env["C"].buildPath(e)).array,
backendHeaders: "
cc.d cdef.d cgcv.d code.d cv4.d dt.d el.d global.d
obj.d oper.d outbuf.d rtlsym.d code_x86.d iasm.d codebuilder.d
ty.d type.d exh.d mach.d mscoff.d dwarf.d dwarf2.d xmm.d
dlist.d melf.d varstats.di
".split.map!(e => env["C"].buildPath(e)).array,
};
sources.dmd = sources.frontend ~ sources.backendHeaders;

Expand Down
35 changes: 4 additions & 31 deletions src/posix.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,21 +343,6 @@ GLUE_SRCS=$(addsuffix .d, $(addprefix $D/,irstate toctype glue gluelayer todt to

DMD_SRCS=$(FRONT_SRCS) $(GLUE_SRCS) $(BACK_HDRS)

BACK_DOBJS = bcomplex.o evalu8.o divcoeff.o dvec.o go.o gsroa.o glocal.o gdag.o gother.o gflow.o \
out.o \
gloop.o compress.o cgelem.o cgcs.o ee.o cod4.o cod5.o nteh.o blockopt.o mem.o cg.o cgreg.o \
dtype.o debugprint.o fp.o symbol.o elem.o dcode.o cgsched.o cg87.o cgxmm.o cgcod.o cod1.o cod2.o \
cod3.o cv8.o dcgcv.o pdata.o util2.o var.o md5.o backconfig.o ph2.o drtlsym.o dwarfeh.o ptrntab.o \
aarray.o dvarstats.o dwarfdbginf.o elfobj.o cgen.o os.o goh.o barray.o cgcse.o elpicpie.o

G_DOBJS = $(addprefix $G/, $(BACK_DOBJS))

ifeq (osx,$(OS))
BACK_DOBJS += machobj.o
else
# BACK_DOBJS += elfobj.o
endif

######## DMD glue layer and backend

GLUE_SRC = \
Expand Down Expand Up @@ -411,7 +396,7 @@ SRC_MAKE = posix.mak osmodel.mak

STRING_IMPORT_FILES = $G/VERSION $G/SYSCONFDIR.imp $(RES)/default_ddoc_theme.ddoc

DEPS = $(patsubst %.o,%.deps,$(DMD_OBJS) $(BACK_OBJS) $(BACK_DOBJS))
DEPS = $(patsubst %.o,%.deps,$(DMD_OBJS))

RUN_BUILD = $(GENERATED)/build HOST_DMD="$(HOST_DMD)" OS=$(OS) BUILD=$(BUILD) MODEL=$(MODEL) AUTO_BOOTSTRAP="$(AUTO_BOOTSTRAP)" --called-from-make

Expand Down Expand Up @@ -443,21 +428,13 @@ toolchain-info:
@echo '==== Toolchain Information ===='
@echo

$G/backend.a: $(G_DOBJS) $(SRC_MAKE)
$(AR) rcs $@ $(G_DOBJS)

$G/dmd_frontend: $(FRONT_SRCS) $D/gluelayer.d $(ROOT_SRCS) $G/lexer.a $(STRING_IMPORT_FILES) $(HOST_DMD_PATH)
$(HOST_DMD_RUN) -of$@ $(MODEL_FLAG) -vtls -J$G -J$(RES) $(DFLAGS) $(filter-out $(STRING_IMPORT_FILES) $(HOST_DMD_PATH),$^) -version=NoBackend

ifdef ENABLE_LTO
$G/dmd: $(DMD_SRCS) $(ROOT_SRCS) $G/lexer.a $(G_DOBJS) $(STRING_IMPORT_FILES) $(HOST_DMD_PATH)
$(HOST_DMD_RUN) -of$@ $(MODEL_FLAG) -vtls -J$G -J$(RES) $(DFLAGS) $(filter-out $(STRING_IMPORT_FILES) $(HOST_DMD_PATH),$^)
else
$G/dmd: $(DMD_SRCS) $(ROOT_SRCS) $G/backend.a $G/lexer.a $(STRING_IMPORT_FILES) $(HOST_DMD_PATH)
$G/dmd: $(DMD_SRCS) $(ROOT_SRCS) $G/lexer.a $G/backend.o $(STRING_IMPORT_FILES) $(HOST_DMD_PATH)
$(HOST_DMD_RUN) -of$@ $(MODEL_FLAG) -vtls -J$G -J$(RES) $(DFLAGS) $(filter-out $(STRING_IMPORT_FILES) $(HOST_DMD_PATH) $(LEXER_ROOT),$^)
endif

$G/dmd-unittest: $(DMD_SRCS) $(ROOT_SRCS) $(LEXER_SRCS) $(G_DOBJS) $(STRING_IMPORT_FILES) $(HOST_DMD_PATH)
$G/dmd-unittest: $(DMD_SRCS) $(ROOT_SRCS) $(LEXER_SRCS) $G/backend.o $(STRING_IMPORT_FILES) $(HOST_DMD_PATH)
$(HOST_DMD_RUN) -of$@ $(MODEL_FLAG) -vtls -J$G -J$(RES) $(DFLAGS) -g -unittest -main -version=NoMain $(filter-out $(STRING_IMPORT_FILES) $(HOST_DMD_PATH),$^)

unittest: $G/dmd-unittest
Expand Down Expand Up @@ -530,10 +507,6 @@ FORCE: ;

-include $(DEPS)

$(G_DOBJS): $G/%.o: $C/%.d posix.mak $(HOST_DMD_PATH)
@echo " (HOST_DMD_RUN) BACK_DOBJS $<"
$(HOST_DMD_RUN) -c -of$@ $(DFLAGS) $(MODEL_FLAG) $(BACK_BETTERC) $(BACK_DFLAGS) $<

################################################################################
# Generate the man pages
################################################################################
Expand Down Expand Up @@ -589,7 +562,7 @@ dscanner: $(DSCANNER_DIR)/dsc
$G/cxxfrontend.o: $G/%.o: tests/%.c $(SRC) $(ROOT_SRC) $(SRC_MAKE)
$(CXX) -c -o$@ $(CXXFLAGS) $(DMD_FLAGS) $(MMD) $<

$G/cxx-unittest: $G/cxxfrontend.o $(DMD_SRCS) $(ROOT_SRCS) $G/lexer.a $(G_DOBJS) $(STRING_IMPORT_FILES) $(HOST_DMD_PATH)
$G/cxx-unittest: $G/cxxfrontend.o $(DMD_SRCS) $(ROOT_SRCS) $G/lexer.a $G/backend.o $(STRING_IMPORT_FILES) $(HOST_DMD_PATH)
CC=$(HOST_CXX) $(HOST_DMD_RUN) -of$@ $(MODEL_FLAG) -vtls -J$G -J$(RES) -L-lstdc++ $(DFLAGS) -version=NoMain $(filter-out $(STRING_IMPORT_FILES) $(HOST_DMD_PATH),$^)

cxx-unittest: $G/cxx-unittest
Expand Down
Loading