gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix build error with "out of tree build"

Browse Source 
- change include-path
- enable memdump by default
This commit is contained in:
Takayuki Okamoto
2017-09-06 21:53:56 +09:00
parent 9a550b310c
commit 8cc264d794
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
configure vendored
View File

@@ -4305,9 +4305,6 @@ case $WITH_TARGET in
if test "X$SBINDIR" = X; then if test "X$SBINDIR" = X; then
SBINDIR="$prefix/sbin" SBINDIR="$prefix/sbin"
fi fi
if test "X$ETCDIR" = X; then
ETCDIR="$prefix/etc"
fi
if test "X$KMODDIR" = X; then if test "X$KMODDIR" = X; then
KMODDIR="$prefix/kmod" KMODDIR="$prefix/kmod"
fi fi
@@ -4334,6 +4331,9 @@ case $WITH_TARGET in
if test "X$INCDIR" = X; then if test "X$INCDIR" = X; then
INCDIR="$prefix/include" INCDIR="$prefix/include"
fi fi
if test "X$ETCDIR" = X; then
ETCDIR="$prefix/etc"
fi
if test "X$KMODDIR" = X; then if test "X$KMODDIR" = X; then
KMODDIR="$prefix/kmod" KMODDIR="$prefix/kmod"
fi fi
@@ -4360,6 +4360,9 @@ case $WITH_TARGET in
if test "X$INCDIR" = X; then if test "X$INCDIR" = X; then
INCDIR="$prefix/include" INCDIR="$prefix/include"
fi fi
if test "X$ETCDIR" = X; then
ETCDIR="$prefix/etc"
fi
if test "X$KMODDIR" = X; then if test "X$KMODDIR" = X; then
KMODDIR="$prefix/kmod" KMODDIR="$prefix/kmod"
fi fi
@@ -4775,7 +4778,7 @@ case $ENABLE_MEMDUMP in
default) default)
# POSTK_DEBUG_ARCH_DEP_30, Expansion of the branch. # POSTK_DEBUG_ARCH_DEP_30, Expansion of the branch.
# if test "x$WITH_TARGET" = "xsmp-x86" ; then # if test "x$WITH_TARGET" = "xsmp-x86" ; then
if test "x$WITH_TARGET" = "xsmp-*" ; then if test "x$WITH_TARGET" = "xsmp-x86" -o "x$WITH_TARGET" = "xsmp-arm64" ; then
ENABLE_MEMDUMP=auto ENABLE_MEMDUMP=auto
else else
ENABLE_MEMDUMP=no ENABLE_MEMDUMP=no

11
configure.ac
View File

@@ -255,9 +255,6 @@ case $WITH_TARGET in
if test "X$SBINDIR" = X; then if test "X$SBINDIR" = X; then
SBINDIR="$prefix/sbin" SBINDIR="$prefix/sbin"
fi fi
if test "X$ETCDIR" = X; then
ETCDIR="$prefix/etc"
fi
if test "X$KMODDIR" = X; then if test "X$KMODDIR" = X; then
KMODDIR="$prefix/kmod" KMODDIR="$prefix/kmod"
fi fi
@@ -284,6 +281,9 @@ case $WITH_TARGET in
if test "X$INCDIR" = X; then if test "X$INCDIR" = X; then
INCDIR="$prefix/include" INCDIR="$prefix/include"
fi fi
if test "X$ETCDIR" = X; then
ETCDIR="$prefix/etc"
fi
if test "X$KMODDIR" = X; then if test "X$KMODDIR" = X; then
KMODDIR="$prefix/kmod" KMODDIR="$prefix/kmod"
fi fi
@@ -310,6 +310,9 @@ case $WITH_TARGET in
if test "X$INCDIR" = X; then if test "X$INCDIR" = X; then
INCDIR="$prefix/include" INCDIR="$prefix/include"
fi fi
if test "X$ETCDIR" = X; then
ETCDIR="$prefix/etc"
fi
if test "X$KMODDIR" = X; then if test "X$KMODDIR" = X; then
KMODDIR="$prefix/kmod" KMODDIR="$prefix/kmod"
fi fi
@@ -404,7 +407,7 @@ case $ENABLE_MEMDUMP in
default) default)
# POSTK_DEBUG_ARCH_DEP_30, Expansion of the branch. # POSTK_DEBUG_ARCH_DEP_30, Expansion of the branch.
# if test "x$WITH_TARGET" = "xsmp-x86" ; then # if test "x$WITH_TARGET" = "xsmp-x86" ; then
if test "x$WITH_TARGET" = "xsmp-*" ; then if test "x$WITH_TARGET" = "xsmp-x86" -o "x$WITH_TARGET" = "xsmp-arm64" ; then
ENABLE_MEMDUMP=auto ENABLE_MEMDUMP=auto
else else
ENABLE_MEMDUMP=no ENABLE_MEMDUMP=no

2
executer/user/Makefile.in
View File

@@ -38,7 +38,7 @@ mcexec: mcexec.c libmcexec.a
#eclair: eclair.c #eclair: eclair.c
# $(CC) $(CFLAGS) -I${IHKDIR} -o $@ $^ $(LIBS) # $(CC) $(CFLAGS) -I${IHKDIR} -o $@ $^ $(LIBS)
eclair: eclair.c arch/$(ARCH)/arch-eclair.c eclair: eclair.c arch/$(ARCH)/arch-eclair.c
$(CC) -I.. -I. -I./arch/$(ARCH)/include -I${IHKDIR} $(CFLAGS) -o $@ $^ $(LIBS) $(CC) -I.. -I. -I./arch/$(ARCH)/include -I$(VPATH)/.. -I$(VPATH) -I$(VPATH)/arch/$(ARCH)/include -I${IHKDIR} $(CFLAGS) -o $@ $^ $(LIBS)
libsched_yield: libsched_yield.c libsched_yield: libsched_yield.c
$(CC) -shared -fPIC -Wl,-soname,sched_yield.so.1 -o libsched_yield.so.1.0.0 $^ -lc -ldl $(CC) -shared -fPIC -Wl,-soname,sched_yield.so.1 -o libsched_yield.so.1.0.0 $^ -lc -ldl