Re mk cross build2 #63
Merged
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
Set LIBRE_SO by means of LIBRE_PATH in lib, which is a more common location.
cspiel1
force-pushed
the
re_mk_cross_build2
branch
from
e7b1ea3
to
fa4869b
Compare
cspiel1
force-pushed
the
re_mk_cross_build2
branch
4 times, most recently
from
3a83244
to
93cf8d2
Compare
Setting SYSROOT should be enough to set all paths for libre resulting in correct CFLAGS and LFLAGS. We do this only if SYSROOT is not the default path "/usr".
cspiel1
force-pushed
the
re_mk_cross_build2
branch
2 times, most recently
from
aef9277
to
388cd36
Compare
sreimers
reviewed
Dec 23, 2020
mk/re.mk
Outdated
| LIBRE_PATH := $(shell [ -f $(SYSROOT)/include/re/re.h ] && \ | ||
| echo "$(SYSROOT)") | ||
| endif | ||
|
|
There was a problem hiding this comment.
I think we should guarantee the prioritised order for relative ../re path search,
Like this (untested):
ifeq ($(LIBRE_PATH),)
LIBRE_PATH := $(shell [ -d ../re ] && echo "../re")
endif
ifeq ($(LIBRE_PATH),)
ifneq ($(SYSROOT),/usr)
LIBRE_PATH := $(shell [ -f $(SYSROOT)/include/re/re.h ] && \
echo "$(SYSROOT)")
endif
endifThere was a problem hiding this comment.
So the new order we should document above:
- relative path (../re)
- custom sysroot
- local installation (/usr/local)
- system installation (/usr)
The new prio order for re dir is: - relative path (../re) - custom SYSROOT - local installation (/usr/local) - system installation (/usr)
|
@sreimers The prio order for re makes sense. STATIC is not used in retest. |
|
The build is error is unrelated. It looks like a race condition since the jbuf changes (occurs sometimes): I had no time to investigate.
Good point, i will remove. |
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.
Allows a cross compilation build by only setting SYSROOT.