Build improvements #114
Build improvements #114
Conversation
Among other things, this allows `make` to correctly track dependencies, i.e., what needs to be rebuilt when changes to source are made.
The login shell can be anything. It may not be a POSIX shell (e.g., it could be fish) in which case the build would break. Or it could be zsh, which would make the build unnecessarily slow. Default to `sh` instead which is a posix shell. Add Makefile variable BUILD_SHELL to make this configurable.
Avoids hard coding the compiler. Allows to pick a custom compiler using the standard `CC=... make` approach.
This is useful since that is a standardized flag, and many build environments set it upon invoking make to the desired values.
Should not elevate privileges for install, as this avoids the rule from working in non-interactive uses (e.g. packaging scripts). Also, with upcoming changes such as support for setting the install prefix, root privileges are not always needed. Finally, it's better for users to explicitly "sudo make install", rather than risking unintentional elevation of privileges.
Support for the quasi-standard "./configure && make && make install" install command sequence. The "configure" part remains optional, i.e., "make && make install" still works, though behind the scenes it does invoke configure. So far, we only support the fairly minimal "--prefix" flag to configure, which is used by packaging scripts to set the installation location.
`mkdir build` is already run by the configure script; thus the individual build rules no longer need to perform this test.
Add dependencies that I had missed. This set is complete, as it was derived by running "gcc -MM".
Also for union and enums
This is one of the C11 features that are required by TCC.
| sudo cp $(BUILD_DIR)/pnut-sh.sh /usr/local/bin/pnut.sh | ||
| install: $(BUILD_DIR)/pnut-sh $(BUILD_DIR)/pnut-sh.sh $(BUILD_DIR)/config.mk | ||
| install -D $(BUILD_DIR)/pnut-sh $(DESTDIR)$(prefix)/bin/pnut | ||
| install -D $(BUILD_DIR)/pnut-sh.sh $(DESTDIR)$(prefix)/bin/pnut.sh |
There was a problem hiding this comment.
Looks like install -D is not BSD-compatible and so make install won't work on macOS 😕
There was a problem hiding this comment.
Ok, good catch. I didn't know this.
| $(BUILD_DIR)/config.mk: | ||
| ./configure | ||
|
|
||
| include $(BUILD_DIR)/config.mk |
There was a problem hiding this comment.
./configure scripts are usually called before using make but it looks like the Makefile creates it if it's missing (but only when make install is used?) so I'm not sure what's the expected usage?
Also, when calling make without first calling the configure script, it complains with Makefile:38: build/config.mk: No such file or directory.
There was a problem hiding this comment.
Right. So the idea was to add support for the ./configure && make approach to building, but keep things working for those that just type make, without the configure first. In order to support that second approach, I added the rule to the Makefile to create config.mk if it does not exist.
You're right that make complains, about the missing config.mk, but then proceeds to create it and load it and all is fine, i.e., the error message is spurious. The GNU make manual contains the following section explaining this:
If an included makefile cannot be found in any of these directories it is not an immediately fatal error; processing of the makefile containing the include continues. Once it has finished reading makefiles, make will try to remake any that are out of date or don’t exist. See How Makefiles Are Remade. Only after it has failed to find a rule to remake the makefile, or it found a rule but the recipe failed, will make diagnose the missing makefile as a fatal error.
| sudo cp $(BUILD_DIR)/pnut-sh /usr/local/bin/pnut | ||
| sudo cp $(BUILD_DIR)/pnut-sh.sh /usr/local/bin/pnut.sh | ||
| install: $(BUILD_DIR)/pnut-sh $(BUILD_DIR)/pnut-sh.sh $(BUILD_DIR)/config.mk | ||
| install -D $(BUILD_DIR)/pnut-sh $(DESTDIR)$(prefix)/bin/pnut |
There was a problem hiding this comment.
I'm not sure how prefix is intended to be used. Can't we simply override DESTDIR instead?
There was a problem hiding this comment.
They are used for different purposes. I recommend to look at this explanation; it's a well written description, in my opinion.
| include $(BUILD_DIR)/config.mk | ||
|
|
||
| PNUT_SH_DEPS=pnut.c debug.c sh.c sh-runtime.c env.c | ||
| PNUT_EXE_DEPS= pnut.c debug.c x86.c exe.c env.c elf.c mach-o.c |
There was a problem hiding this comment.
I didn't know about gcc -MM. It would have been useful when implementing the measure-file-size.sh script!
laurenthuberdeau
force-pushed
the
main
branch
from
cfa2032 to
5eaa69f
Compare
Implement a number of improvements to the build system