vppinfra: don't fail if config.h is missing, fallback to defaults instead
Type: improvement Change-Id: Idc82d40a16cbc8a401a8fb359bc63083f47361b9 Signed-off-by: Damjan Marion <damarion@cisco.com>
This commit is contained in:

committed by
Florin Coras

parent
df6d986f81
commit
edca8c6e75
@ -1,16 +1,12 @@
|
|||||||
#/bin/env bash
|
#/bin/env bash
|
||||||
|
|
||||||
src=$(realpath $(dirname $0)/../..)/src
|
src=$(realpath $(dirname $0)/../..)/src
|
||||||
tmp=$(mktemp -d)
|
|
||||||
mkdir ${tmp}/vppinfra
|
|
||||||
touch ${tmp}/vppinfra/config.h
|
|
||||||
|
|
||||||
${CC:-cc} \
|
${CC:-cc} \
|
||||||
-O2 \
|
-O2 \
|
||||||
-flto \
|
-flto \
|
||||||
-static \
|
-static \
|
||||||
-I ${src} \
|
-I ${src} \
|
||||||
-I ${tmp} \
|
|
||||||
${src}/vppinfra/backtrace.c \
|
${src}/vppinfra/backtrace.c \
|
||||||
${src}/vppinfra/dlmalloc.c \
|
${src}/vppinfra/dlmalloc.c \
|
||||||
${src}/vppinfra/elf.c \
|
${src}/vppinfra/elf.c \
|
||||||
@ -29,6 +25,3 @@ ${CC:-cc} \
|
|||||||
${src}/vppinfra/linux/mem.c \
|
${src}/vppinfra/linux/mem.c \
|
||||||
${src}/vpp/app/vppctl.c \
|
${src}/vpp/app/vppctl.c \
|
||||||
-o vppctl
|
-o vppctl
|
||||||
|
|
||||||
rm ${tmp}/vppinfra/config.h
|
|
||||||
rmdir ${tmp}/vppinfra ${tmp}
|
|
||||||
|
@ -39,7 +39,10 @@
|
|||||||
#define included_clib_h
|
#define included_clib_h
|
||||||
|
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
|
|
||||||
|
#if __has_include(<vppinfra/config.h>)
|
||||||
#include <vppinfra/config.h>
|
#include <vppinfra/config.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef __x86_64__
|
#ifdef __x86_64__
|
||||||
#include <x86intrin.h>
|
#include <x86intrin.h>
|
||||||
|
@ -38,6 +38,10 @@
|
|||||||
#include <vppinfra/vec.h>
|
#include <vppinfra/vec.h>
|
||||||
#include <vppinfra/mem.h>
|
#include <vppinfra/mem.h>
|
||||||
|
|
||||||
|
#ifndef CLIB_VECTOR_GROW_BY_ONE
|
||||||
|
#define CLIB_VECTOR_GROW_BY_ONE 0
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Vector resize operator. Called as needed by various macros such as
|
/* Vector resize operator. Called as needed by various macros such as
|
||||||
vec_add1() when we need to allocate memory. */
|
vec_add1() when we need to allocate memory. */
|
||||||
__clib_export void *
|
__clib_export void *
|
||||||
|
Reference in New Issue
Block a user