This is an archive of the discontinued LLVM Phabricator instance.

Differential D68558

[Testsuite] Get rid of most of the recursive shared library Makefiles
ClosedPublic

Authored by friss on Oct 6 2019, 6:31 PM.

Details

Reviewers
aprantl
labath
Commits
rG3fb4e49a68f5: [Testsuite] Get rid of most of the recursive shared library Makefiles
rLLDB374076: [Testsuite] Get rid of most of the recursive shared library Makefiles
rL374076: [Testsuite] Get rid of most of the recursive shared library Makefiles
Summary

I was working on cleaning up our on-device test runs last week, and as
a result I needed to update a lot of test Makefiles in the Swift
tree. I found it especailly annoying to update the build system of
tests that are building mutliple images (typically a shared
library).

The main reason is that you can't see what's (if anything) special
about the build from the main makefile. You always need to open
mutliple Makefiles. Another reason is the way you have to add a
special line to your clean rule to do the right thing, and you never
really know which arguments to pass.

Most of the secondary Makefiles we have are just a couple variable
definitions and then an include of Makefile.rules. This patch removes
most of the secondary Makefiles and replaces them with a direct
invocation of Makefile.rules in the main Makefile. The specificities
of each sub-build are listed right there on the recursive $(MAKE)
call. All the variables that matter are being passed automagically by
make as they have been passed on the command line. The only things you
need to specify are the variables customizating the Makefile.rules
logic for each image.

This patch also deals with the clean rules using this trick to avoid
having to duplicate the recursive invocation in a separate clean rule:

mylib clean::

$(MAKE) -f $(MAKEFILE_RULES) ... $(MAKECMDGOALS)

The MAKECMDGOALS variable at the end contains the list of build goals
that have been passed on the command line. When it's empty, this
invocation just calls the default Makefile.rules rule which is what
you want. When "clean" is passed as a goal, the rule will be invoked
too and it is passed through MAKECMDGOALS invoking the appropriate
cleaning logic from Makefile.rules.

I really like the conciseness of this approach and the fact that
everything is visible in one place. What do others think?

Diff Detail

Event Timeline

friss created this revision.Oct 6 2019, 6:31 PM
Herald added a project: Restricted Project. · View Herald TranscriptOct 6 2019, 6:31 PM
Harbormaster completed remote builds in B39060: Diff 223449.Oct 6 2019, 6:31 PM
labath added a comment.Oct 7 2019, 10:26 AM

I like the idea of passing the variable values "inline". The MAKECMDGOALS thingy seems... clever. I sort of like it, and it also feels like it might be too much. I suppose that is fine, but.. do we actually need a functional clean rule? I was under the impression that ever since we moved tests to build out-of-tree the clean rule doesn't do much and isn't even being invoked by default. Should we just delete the clean rules altogether? The handful of tests that actually want to clean and rebuild as a part of the test can do something custom...

aprantl added a comment.Oct 7 2019, 10:28 AM

This is some really tricky Make (wow), but I think the benefit of it being so much shorter and localized outweighs the steeper learning curve. Thanks!

lldb/packages/Python/lldbsuite/test/commands/expression/top-level/Makefile
9

Can you make sure that this is passing what's necessary by removing the default rule from Makefile.rules that initializes CC ?=

lldb/packages/Python/lldbsuite/test/commands/target/create-deps/Makefile
1

= -L$(BUILDDIR) ?
Perhaps := -L. is preferable.

lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/Makefile
1

Is $(LIBPREFIX) available here? shouldn't this be = instead?

lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Makefile
1–2

:= and $(BUILDDIR)

2

:=

12

Let's move these past the include Makefile.rules for symmetry.

friss added a comment.Oct 7 2019, 12:26 PM
In D68558#1697890, @labath wrote:

I like the idea of passing the variable values "inline". The MAKECMDGOALS thingy seems... clever. I sort of like it, and it also feels like it might be too much.

This is why I didn't commit this without review, I do feel the same.

do we actually need a functional clean rule? I was under the impression that ever since we moved tests to build out-of-tree the clean rule doesn't do much and isn't even being invoked by default. Should we just delete the clean rules altogether? The handful of tests that actually want to clean and rebuild as a part of the test can do something custom...

Pretty sure the test runs don't need the clean rule, but it's nice to have when manually iterating over the build phase of a test. OTOH, manually doing a "rm -rf" of the build directory is not a big burden.

Anybody else objects to getting rid of the clean rules?

JDevlieghere added a subscriber: JDevlieghere.Oct 7 2019, 2:05 PM
JDevlieghere added a comment.Oct 7 2019, 2:15 PM
In D68558#1698031, @friss wrote:

Pretty sure the test runs don't need the clean rule, but it's nice to have when manually iterating over the build phase of a test. OTOH, manually doing a "rm -rf" of the build directory is not a big burden.

Anybody else objects to getting rid of the clean rules?

I like having the clean rule when I'm debugging a particular test and I'm messing with the Makefile. I don't mind having to manually remove the build directory, but it seems like we could just make that the top-level clean rule. If we go that route, let's put in a safeguard so that you don't accidentally remove your current working directory if you forget to pass the -C flag.

friss updated this revision to Diff 223683.Oct 7 2019, 3:37 PM

Addressed review feedback.

Completely removed the clean code for the Makefiles and reworked it in
Makefile.rules to be much simpler and catch-all.

aprantl added inline comments.Oct 7 2019, 4:03 PM
lldb/packages/Python/lldbsuite/test/make/Makefile.rules
771

I would just error, period. IMHO make clean shouldn'd delete anything that make doesn't know how to rebuild and I don't think we have any rule to restore $(BUILDDIR), do we?

friss marked an inline comment as done.Oct 7 2019, 4:14 PM
friss added inline comments.
lldb/packages/Python/lldbsuite/test/make/Makefile.rules
771

We don't delete $(BUILDDIR), we delete what's inside of it. I would have gotten rid of the rule completely, but having a clean rule is handy in one circumstance: when iterating over the build of a new test (or like I did last week rework a lot of existing test builds). There you want to be able to run the make command by itself, and being able to quickly iterate with make clean all is really nice. I don't think we're taking any risk here as the rule checks whether we are inside a directory that dotest is going to wipe anyway.

aprantl accepted this revision.Oct 7 2019, 4:21 PM

We don't delete $(BUILDDIR), we delete what's inside of it.

Sorry, I missed that detail!

This revision is now accepted and ready to land.Oct 7 2019, 4:21 PM
JDevlieghere added a comment.Oct 7 2019, 4:35 PM

Thanks, LGTM!

Harbormaster completed remote builds in B39118: Diff 223683.Oct 7 2019, 10:06 PM
labath accepted this revision.Oct 8 2019, 2:28 AM
Closed by commit rG3fb4e49a68f5: [Testsuite] Get rid of most of the recursive shared library Makefiles (authored by friss). · Explain WhyOct 8 2019, 9:24 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lldb/
packages/
Python/
lldbsuite/
test/
commands/
expression/
top-level/
11 lines
target/
create-deps/
16 lines
functionalities/
exec/
10 lines
jitloader_gdb/
6 lines
load_unload/
36 lines
load_using_paths/
9 lines
lang/
cpp/
namespace_definitions/
20 lines
objc/
conflicting-definition/
26 lines
Test/
TestExt/
macosx/
lc-note/
kern-ver-str/
6 lines
macabi/
9 lines
make/
28 lines
tools/
lldb-server/
libraries-svr4/
18 lines

Diff 223883

lldb/packages/Python/lldbsuite/test/commands/expression/top-level/Makefile

CXX_SOURCES := main.cpp test.cpp CXX_SOURCES := main.cpp test.cpp
include Makefile.rules all: dummy
a.out: dummy include Makefile.rules
dummy: dummy: dummy.cpp
$(MAKE) VPATH=$(VPATH) -I $(SRCDIR) -f $(SRCDIR)/dummy.mk $(MAKE) -f $(MAKEFILE_RULES) \
CXX_SOURCES=dummy.cpp EXE=dummy
aprantlUnsubmitted
Not Done
ReplyInline Actions

Can you make sure that this is passing what's necessary by removing the default rule from Makefile.rules that initializes CC ?=

aprantl: Can you make sure that this is passing what's necessary by removing the default rule from…
clean::
$(MAKE) VPATH=$(VPATH) -I $(SRCDIR) -f $(SRCDIR)/dummy.mk clean

lldb/packages/Python/lldbsuite/test/commands/expression/top-level/dummy.mk

  • This file was deleted.
CXX_SOURCES := dummy.cpp
EXE := dummy
include Makefile.rules

lldb/packages/Python/lldbsuite/test/commands/target/create-deps/Makefile

LIB_PREFIX := load_ LD_EXTRAS := -L. -lload_a
aprantlUnsubmitted
Not Done
ReplyInline Actions

= -L$(BUILDDIR) ?
Perhaps := -L. is preferable.

aprantl: `= -L$(BUILDDIR)` ? Perhaps `:= -L.` is preferable.
LD_EXTRAS := -L. -l$(LIB_PREFIX)a
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
include Makefile.rules a.out: libload_a
a.out: lib_a
lib_%: include Makefile.rules
$(MAKE) VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/$*.mk
clean:: libload_a:
$(MAKE) -f $(SRCDIR)/a.mk clean $(MAKE) -f $(MAKEFILE_RULES) \
DYLIB_ONLY=YES DYLIB_NAME=load_a DYLIB_CXX_SOURCES=a.cpp

lldb/packages/Python/lldbsuite/test/commands/target/create-deps/a.mk

  • This file was deleted.
LIB_PREFIX := load_
DYLIB_NAME := $(LIB_PREFIX)a
DYLIB_CXX_SOURCES := a.cpp
DYLIB_ONLY := YES
include Makefile.rules

lldb/packages/Python/lldbsuite/test/functionalities/exec/Makefile

CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
all: a.out secondprog all: secondprog
include Makefile.rules include Makefile.rules
secondprog: secondprog: secondprog.cpp
$(MAKE) VPATH=$(VPATH) -f $(SRCDIR)/secondprog.mk $(MAKE) -f $(MAKEFILE_RULES) \
CXX_SOURCES=secondprog.cpp EXE=secondprog
clean::
$(MAKE) -f $(SRCDIR)/secondprog.mk clean

lldb/packages/Python/lldbsuite/test/functionalities/exec/secondprog.mk

  • This file was deleted.
CXX_SOURCES := secondprog.cpp
EXE = secondprog
include Makefile.rules

lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/Makefile

C_SOURCES := main.c C_SOURCES := main.c
all: a.out simple all: a.out simple
include Makefile.rules include Makefile.rules
simple: simple:
$(MAKE) VPATH=$(VPATH) -f $(SRCDIR)/simple.mk $(MAKE) -f $(MAKEFILE_RULES) \
C_SOURCES=simple.c EXE=simple
clean::
$(MAKE) -f $(SRCDIR)/simple.mk clean
No newline at end of file

lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/simple.mk

  • This file was deleted.
C_SOURCES := simple.c
EXE = simple
include Makefile.rules

lldb/packages/Python/lldbsuite/test/functionalities/load_unload/Makefile

LIB_PREFIX := loadunload_ LD_EXTRAS := -L. -lloadunload_d
LD_EXTRAS := -L. -l$(LIB_PREFIX)d
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
USE_LIBDL := 1 USE_LIBDL := 1
include Makefile.rules a.out: lib_b lib_a lib_c lib_d hidden_lib_d
a.out: lib_a lib_b lib_c lib_d hidden_lib_d install_name_tool
lib_%: include Makefile.rules
$(MAKE) VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/$*.mk
install_name_tool: lib_a: lib_b
$(MAKE) -f $(MAKEFILE_RULES) \
DYLIB_ONLY=YES DYLIB_CXX_SOURCES=a.cpp DYLIB_NAME=loadunload_a \
LD_EXTRAS="-L. -lloadunload_b"
lib_b:
$(MAKE) -f $(MAKEFILE_RULES) \
DYLIB_ONLY=YES DYLIB_CXX_SOURCES=b.cpp DYLIB_NAME=loadunload_b
lib_c:
$(MAKE) -f $(MAKEFILE_RULES) \
DYLIB_ONLY=YES DYLIB_CXX_SOURCES=c.cpp DYLIB_NAME=loadunload_c
lib_d:
$(MAKE) -f $(MAKEFILE_RULES) \
DYLIB_ONLY=YES DYLIB_CXX_SOURCES=d.cpp DYLIB_NAME=loadunload_d
ifeq ($(OS),Darwin) ifeq ($(OS),Darwin)
install_name_tool -id @executable_path/libloadunload_d.dylib libloadunload_d.dylib install_name_tool -id @executable_path/libloadunload_d.dylib libloadunload_d.dylib
endif endif
hidden_lib_d: hidden_lib_d:
$(MAKE) VPATH=$(SRCDIR)/hidden -I $(SRCDIR)/hidden -C hidden -f $(SRCDIR)/hidden/Makefile mkdir -p hidden
$(MAKE) VPATH=$(SRCDIR)/hidden -C hidden -f $(MAKEFILE_RULES) \
clean:: DYLIB_ONLY=YES DYLIB_CXX_SOURCES=d.cpp DYLIB_NAME=loadunload_d
$(MAKE) -f $(SRCDIR)/a.mk clean
$(MAKE) -f $(SRCDIR)/b.mk clean
$(MAKE) -f $(SRCDIR)/c.mk clean
$(MAKE) -f $(SRCDIR)/d.mk clean
$(MAKE) -I $(SRCDIR)/hidden -C hidden -f $(SRCDIR)/hidden/Makefile clean

lldb/packages/Python/lldbsuite/test/functionalities/load_unload/a.mk

  • This file was deleted.
LIB_PREFIX := loadunload_
LD_EXTRAS := -L. -l$(LIB_PREFIX)b
DYLIB_NAME := $(LIB_PREFIX)a
DYLIB_CXX_SOURCES := a.cpp
DYLIB_ONLY := YES
include Makefile.rules
$(DYLIB_FILENAME): lib_b
.PHONY lib_b:
$(MAKE) VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/b.mk
clean::
$(MAKE) -I $(SRCDIR) -f $(SRCDIR)/b.mk clean

lldb/packages/Python/lldbsuite/test/functionalities/load_unload/b.mk

  • This file was deleted.
LIB_PREFIX := loadunload_
DYLIB_NAME := $(LIB_PREFIX)b
DYLIB_CXX_SOURCES := b.cpp
DYLIB_ONLY := YES
include Makefile.rules

lldb/packages/Python/lldbsuite/test/functionalities/load_unload/c.mk

  • This file was deleted.
LIB_PREFIX := loadunload_
DYLIB_NAME := $(LIB_PREFIX)c
DYLIB_CXX_SOURCES := c.cpp
DYLIB_ONLY := YES
include Makefile.rules

lldb/packages/Python/lldbsuite/test/functionalities/load_unload/d.mk

  • This file was deleted.
LIB_PREFIX := loadunload_
DYLIB_EXECUTABLE_PATH := $(CURDIR)
DYLIB_NAME := $(LIB_PREFIX)d
DYLIB_CXX_SOURCES := d.cpp
DYLIB_ONLY := YES
include Makefile.rules

lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/Makefile

CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
USE_LIBDL := 1 USE_LIBDL := 1
include Makefile.rules
all: hidden_lib a.out all: hidden_lib a.out
include Makefile.rules
hidden_lib: hidden_lib:
$(MAKE) VPATH=$(SRCDIR)/hidden -I $(SRCDIR)/hidden -C hidden -f $(SRCDIR)/hidden/Makefile $(MAKE) VPATH=$(SRCDIR)/hidden -C hidden -f $(MAKEFILE_RULES) \
DYLIB_ONLY=YES DYLIB_CXX_SOURCES=d.cpp DYLIB_NAME=loadunload
clean::
$(MAKE) -I $(SRCDIR)/hidden -C hidden -f $(SRCDIR)/hidden/Makefile clean

lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/Makefile

LD_EXTRAS := -L. -l$(LIB_PREFIX)a -l$(LIB_PREFIX)b LD_EXTRAS := -L. -la -lb
aprantlUnsubmitted
Not Done
ReplyInline Actions

Is $(LIBPREFIX) available here? shouldn't this be = instead?

aprantl: Is $(LIBPREFIX) available here? shouldn't this be `=` instead?
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
include Makefile.rules a.out: liba libb
.PHONY: include Makefile.rules
a.out: lib_a lib_b
lib_%: liba:
$(MAKE) VPATH=$(VPATH) -f $(SRCDIR)/$*.mk $(MAKE) -f $(MAKEFILE_RULES) \
DYLIB_ONLY=YES DYLIB_NAME=a DYLIB_CXX_SOURCES=a.cpp
hidden_lib_d: libb:
$(MAKE) -C hidden $(MAKE) -f $(MAKEFILE_RULES) \
DYLIB_ONLY=YES DYLIB_NAME=b DYLIB_CXX_SOURCES=b.cpp
clean::
$(MAKE) -f $(SRCDIR)/a.mk clean
$(MAKE) -f $(SRCDIR)/b.mk clean

lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/a.mk

  • This file was deleted.
DYLIB_NAME := a
DYLIB_CXX_SOURCES := a.cpp
DYLIB_ONLY := YES
include Makefile.rules

lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/b.mk

  • This file was deleted.
DYLIB_NAME := b
DYLIB_CXX_SOURCES := b.cpp
DYLIB_ONLY := YES
include Makefile.rules

lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Makefile

LD_EXTRAS = -lobjc -framework Foundation LD_EXTRAS := -lobjc -framework Foundation -L. -lTest -lTestExt
OBJC_SOURCES := main.m
aprantlUnsubmitted
Not Done
ReplyInline Actions

:=

aprantl: :=
aprantlUnsubmitted
Not Done
ReplyInline Actions

:= and $(BUILDDIR)

aprantl: := and $(BUILDDIR)
include Makefile.rules
all: a.out all: a.out
a.out: libTest.dylib libTestExt.dylib
include Makefile.rules
libTest.dylib: Test/Test.m libTest.dylib: Test/Test.m
mkdir -p Test mkdir -p Test
$(MAKE) MAKE_DSYM=YES VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/Test/Test.mk all $(MAKE) MAKE_DSYM=YES -f $(MAKEFILE_RULES) \
aprantlUnsubmitted
Not Done
ReplyInline Actions

Let's move these past the include Makefile.rules for symmetry.

aprantl: Let's move these past the `include Makefile.rules` for symmetry.
DYLIB_ONLY=YES DYLIB_NAME=Test DYLIB_OBJC_SOURCES=Test/Test.m \
LD_EXTRAS="-lobjc -framework Foundation" \
CFLAGS_EXTRAS=-I$(SRCDIR)
libTestExt.dylib: TestExt/TestExt.m libTestExt.dylib: TestExt/TestExt.m
mkdir -p TestExt mkdir -p TestExt
$(MAKE) MAKE_DSYM=YES VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/TestExt/TestExt.mk all $(MAKE) MAKE_DSYM=YES -f $(MAKEFILE_RULES) \
DYLIB_ONLY=YES DYLIB_NAME=TestExt DYLIB_OBJC_SOURCES=TestExt/TestExt.m \
a.out: main.m libTest.dylib libTestExt.dylib LD_EXTRAS="-lobjc -framework Foundation -lTest -L." \
$(CC) $(LDFLAGS) -I$(SRCDIR) -L. -lTest -lTestExt -o a.out $< CFLAGS_EXTRAS=-I$(SRCDIR)
clean::
rm -rf libTest.dylib libTestExt.dylib a.out Test.o TestExt.o libTest.dylib.dSYM libTestExt.dylib.dSYM
$(MAKE) MAKE_DSYM=YES VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/Test/Test.mk clean
$(MAKE) MAKE_DSYM=YES VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/TestExt/TestExt.mk clean

lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Test/Test.mk

  • This file was deleted.
DYLIB_NAME := Test
DYLIB_ONLY := YES
CFLAGS_EXTRAS = -I$(SRCDIR)/..
LD_EXTRAS = -lobjc -framework Foundation
DYLIB_OBJC_SOURCES = Test/Test.m
include Makefile.rules

lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/TestExt/TestExt.mk

  • This file was deleted.
DYLIB_NAME := TestExt
DYLIB_ONLY := YES
CFLAGS_EXTRAS = -I$(SRCDIR)/..
LD_EXTRAS = -L. -lTest -lobjc -framework Foundation
DYLIB_OBJC_SOURCES = TestExt/TestExt.m
include Makefile.rules

lldb/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/Makefile

MAKE_DSYM := NO MAKE_DSYM := NO
C_SOURCES := main.c C_SOURCES := main.c
all: a.out create-empty-corefile all: a.out create-empty-corefile
create-empty-corefile: create-empty-corefile:
$(MAKE) VPATH=$(VPATH) -f $(SRCDIR)/create-empty-corefile.mk $(MAKE) -f $(MAKEFILE_RULES) EXE=create-empty-corefile \
C_SOURCES=create-empty-corefile.c
clean::
$(MAKE) -f create-empty-corefile.mk clean
include Makefile.rules include Makefile.rules

lldb/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/create-empty-corefile.mk

  • This file was deleted.
MAKE_DSYM := NO
CXX_SOURCES := create-empty-corefile.cpp
EXE = create-empty-corefile
include Makefile.rules

lldb/packages/Python/lldbsuite/test/macosx/macabi/Makefile

LEVEL = ../../make LEVEL = ../../make
C_SOURCES := main.c C_SOURCES := main.c
LD_EXTRAS := -L. -lfoo LD_EXTRAS := -L. -lfoo
TRIPLE := x86_64-apple-ios13.0-macabi TRIPLE := x86_64-apple-ios13.0-macabi
CFLAGS_EXTRAS := -target $(TRIPLE) CFLAGS_EXTRAS := -target $(TRIPLE)
all: libfoo.dylib a.out all: libfoo.dylib a.out
lib%.dylib: %.c libfoo.dylib: foo.c \
$(MAKE) MAKE_DSYM=YES CC=$(CC) \ $(MAKE) -f $(MAKEFILE_RULES) \
ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \ DYLIB_ONLY=YES DYLIB_NAME=foo DYLIB_C_SOURCES=foo.c
BASENAME=$(shell basename $< .c) \
TRIPLE=x86_64-apple-macosx10.15 SDKROOT=$(SDKROOT) \
VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk all
include $(LEVEL)/Makefile.rules include $(LEVEL)/Makefile.rules

lldb/packages/Python/lldbsuite/test/macosx/macabi/dylib.mk

  • This file was deleted.
LEVEL = ../../make
DYLIB_ONLY := YES
DYLIB_NAME := $(BASENAME)
DYLIB_C_SOURCES := $(DYLIB_NAME).c
include $(LEVEL)/Makefile.rules

lldb/packages/Python/lldbsuite/test/make/Makefile.rules

Show All 30 Lines
# ARCHIVE_NAME := libfoo.a # ARCHIVE_NAME := libfoo.a
# ARCHIVE_C_SOURCES := a.c b.c # ARCHIVE_C_SOURCES := a.c b.c
# Uncomment line below for debugging shell commands # Uncomment line below for debugging shell commands
# SHELL = /bin/sh -x # SHELL = /bin/sh -x
SRCDIR := $(shell dirname $(firstword $(MAKEFILE_LIST))) SRCDIR := $(shell dirname $(firstword $(MAKEFILE_LIST)))
BUILDDIR := $(shell pwd) BUILDDIR := $(shell pwd)
THIS_FILE_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST))) MAKEFILE_RULES := $(lastword $(MAKEFILE_LIST))
THIS_FILE_DIR := $(shell dirname $(MAKEFILE_RULES))
LLDB_BASE_DIR := $(THIS_FILE_DIR)/../../../../../ LLDB_BASE_DIR := $(THIS_FILE_DIR)/../../../../../
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# If OS is not defined, use 'uname -s' to determine the OS name. # If OS is not defined, use 'uname -s' to determine the OS name.
# #
# uname on Windows gives "windows32" or "server version windows32", but most # uname on Windows gives "windows32" or "server version windows32", but most
# environments standardize on "Windows_NT", so we'll make it consistent here. # environments standardize on "Windows_NT", so we'll make it consistent here.
# When running tests from Visual Studio, the environment variable isn't # When running tests from Visual Studio, the environment variable isn't
▲ Show 20 Lines • Show All 711 Lines • ▼ Show 20 Lines
.SUFFIXES: .mm .o .SUFFIXES: .mm .o
.mm.o: .mm.o:
$(CXX) $(CXXFLAGS) -c $< $(CXX) $(CXXFLAGS) -c $<
.PHONY: clean .PHONY: clean
dsym: $(DSYM) dsym: $(DSYM)
all: $(EXE) $(DSYM) all: $(EXE) $(DSYM)
clean:: clean::
$(RM) -rf $(OBJECTS) $(PREREQS) $(PREREQS:.d=.d.tmp) $(DWOS) $(ARCHIVE_NAME) $(ARCHIVE_OBJECTS) $(CLANG_MODULE_CACHE_DIR) ifeq "$(findstring lldb-test-build.noindex, $(BUILDDIR))" ""
ifneq "$(DYLIB_NAME)" "" $(error Trying to invoke the clean rule, but not using the default build tree layout)
$(RM) -r $(DYLIB_FILENAME).dSYM
$(RM) $(DYLIB_OBJECTS) $(DYLIB_PREREQS) $(DYLIB_PREREQS:.d=.d.tmp) $(DYLIB_DWOS) $(DYLIB_FILENAME) $(DYLIB_FILENAME).debug
endif
ifneq "$(FRAMEWORK)" ""
$(RM) -rf $(FRAMEWORK).framework
endif
ifneq "$(PCH_OUTPUT)" ""
$(RM) $(PCH_OUTPUT)
endif
ifneq "$(DSYM)" ""
$(RM) -r "$(DSYM)"
endif
ifeq "$(OS)" "Windows_NT"
# http://llvm.org/pr24589
IF EXIST "$(EXE)" del "$(EXE)"
$(RM) $(wildcard *.manifest *.pdb *.ilk)
ifneq "$(DYLIB_NAME)" ""
$(RM) $(DYLIB_NAME).lib $(DYLIB_NAME).exp
endif
else else
$(RM) "$(EXE)" $(RM) -r $(wildcard $(BUILDDIR)/*)
aprantlUnsubmitted
Not Done
ReplyInline Actions

I would just error, period. IMHO make clean shouldn'd delete anything that make doesn't know how to rebuild and I don't think we have any rule to restore $(BUILDDIR), do we?

aprantl: I would just error, period. IMHO `make clean` shouldn'd delete anything that `make` doesn't…
frissAuthorUnsubmitted
Done
ReplyInline Actions

We don't delete $(BUILDDIR), we delete what's inside of it. I would have gotten rid of the rule completely, but having a clean rule is handy in one circumstance: when iterating over the build of a new test (or like I did last week rework a lot of existing test builds). There you want to be able to run the make command by itself, and being able to quickly iterate with make clean all is really nice. I don't think we're taking any risk here as the rule checks whether we are inside a directory that dotest is going to wipe anyway.

friss: We don't delete $(BUILDDIR), we delete what's inside of it. I would have gotten rid of the rule…
endif endif
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# From http://blog.melski.net/tag/debugging-makefiles/ # From http://blog.melski.net/tag/debugging-makefiles/
# #
# Usage: make print-CC print-CXX print-LD # Usage: make print-CC print-CXX print-LD
#---------------------------------------------------------------------- #----------------------------------------------------------------------
print-%: print-%:
@echo '$*=$($*)' @echo '$*=$($*)'
@echo ' origin = $(origin $*)' @echo ' origin = $(origin $*)'
@echo ' flavor = $(flavor $*)' @echo ' flavor = $(flavor $*)'
@echo ' value = $(value $*)' @echo ' value = $(value $*)'
### Local Variables: ### ### Local Variables: ###
### mode:makefile ### ### mode:makefile ###
### End: ### ### End: ###

lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/Makefile

LIB_PREFIX := svr4lib LIB_PREFIX := svr4lib
LD_EXTRAS := -L. -l$(LIB_PREFIX)_a -l$(LIB_PREFIX)_b\" LD_EXTRAS := -L. -lsvr4lib_a -lsvr4lib_b\"
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
USE_LIBDL := 1 USE_LIBDL := 1
MAKE_DSYM := NO MAKE_DSYM := NO
include Makefile.rules a.out: svr4lib_a svr4lib_b_quote
a.out: $(LIB_PREFIX)_a $(LIB_PREFIX)_b_quote include Makefile.rules
svr4lib_%: svr4lib_a:
$(MAKE) VPATH=$(SRCDIR) -I $(SRCDIR) -f "$(SRCDIR)/$(LIB_PREFIX)_$*.mk" $(MAKE) -f $(MAKEFILE_RULES) \
DYLIB_NAME=svr4lib_a DYLIB_CXX_SOURCES=svr4lib_a.cpp \
DYLIB_ONLY=YES
clean:: svr4lib_b_quote:
$(MAKE) -f $(SRCDIR)/$(LIB_PREFIX)_a.mk clean $(MAKE) -f $(MAKEFILE_RULES) \
DYLIB_NAME=svr4lib_b\\\" DYLIB_CXX_SOURCES=svr4lib_b_quote.cpp \
DYLIB_ONLY=YES

lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/svr4lib_a.mk

  • This file was deleted.
LIB_PREFIX := svr4lib
DYLIB_NAME := $(LIB_PREFIX)_a
DYLIB_CXX_SOURCES := $(LIB_PREFIX)_a.cpp
DYLIB_ONLY := YES
include Makefile.rules

lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/svr4lib_b_quote.mk

  • This file was deleted.
LIB_PREFIX := svr4lib
DYLIB_NAME := $(LIB_PREFIX)_b\"
DYLIB_CXX_SOURCES := $(LIB_PREFIX)_b_quote.cpp
DYLIB_ONLY := YES
include Makefile.rules
lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/Makefile