[chore]: Makefile.defs - use tabs everywhere and remove old unused code #752
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pazos
force-pushed
the
tabs
branch
3 times, most recently
from
45c676c
to
d29c61a
Compare
Frenzie
reviewed
Nov 8, 2018
Makefile.defs
Outdated
| COMPAT_CXXFLAGS:=$(UBUNTU_COMPAT_CFLAGS) | ||
| ifeq ($(shell PATH='$(PATH)' $(CC) -dumpmachine 2>/dev/null), arm-linux-gnueabi) | ||
| COMPAT_CFLAGS:=$(UBUNTU_COMPAT_CFLAGS) | ||
| COMPAT_CXXFLAGS:=$(UBUNTU_COMPAT_CFLAGS) | ||
| endif |
Frenzie
reviewed
Nov 8, 2018
| $(info ************ Building for MACHINE: "$(MACHINE)" **********) | ||
| $(info ************ PATH: "$(PATH)" **********) | ||
| $(info ************ CHOST: "$(CHOST)" **********) | ||
| MACHINE:=$(MACHINE)-debug |
There was a problem hiding this comment.
I don't see it at a glance, but there must be a stray tab or something somewhere prior to here, unfortunately. :-)
There was a problem hiding this comment.
Don't understand this one :p
FYI: I'm checking in vim with
:syntax on
:set syntax=whitespace
and I see tabs there
There was a problem hiding this comment.
L269 is the one with spaces, as @Frenzie pointed out ;).
There was a problem hiding this comment.
Don't indent the lines with info and/or move them along these lines:
diff --git a/Makefile b/Makefile
index 8ab6d7a..3ccca4b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,9 @@
include Makefile.defs
+$(info ************ Building for MACHINE: "$(MACHINE)" **********)
+$(info ************ PATH: "$(PATH)" **********)
+$(info ************ CHOST: "$(CHOST)" **********)
+
# main target
all: $(OUTPUT_DIR)/libs $(if $(ANDROID),,$(LUAJIT)) \
$(if $(USE_LUAJIT_LIB),$(LUAJIT_LIB),) \
diff --git a/Makefile.defs b/Makefile.defs
index b6f72ab..b88840b 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -460,9 +460,7 @@ endif
MACHINE?=$(shell PATH='$(PATH)' $(CC) -dumpmachine 2>/dev/null)
ifdef KODEBUG
MACHINE:=$(MACHINE)-debug
- $(info ************ Building for MACHINE: "$(MACHINE)" **********)
- $(info ************ PATH: "$(PATH)" **********)
- $(info ************ CHOST: "$(CHOST)" **********)
endif
OUTPUT_DIR?=build/$(MACHINE)I'm inclined to think this little bit of crucial info shouldn't hide behind special debug flags anyway.
It might need to be done a touch more intelligently though.
|
Updated 👍 |
Frenzie
approved these changes
Nov 10, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Use tabs everywhere as talked in #745. Also I found old code which is not used anywhere. Remove it.