From 0feaf5cc3a6cec0a4f056e4e72ed6469769268a4 Mon Sep 17 00:00:00 2001 From: Valentin Churavy Date: Sat, 3 Dec 2022 20:46:27 -0500 Subject: [PATCH] Prioritize build_dir for generated headers (#47783) --- src/julia.h | 6 ++++-- src/julia_internal.h | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/julia.h b/src/julia.h index c79f7d0d1303a..c40d3ce3b88e5 100644 --- a/src/julia.h +++ b/src/julia.h @@ -4,7 +4,9 @@ #define JULIA_H #ifdef LIBRARY_EXPORTS -#include "jl_internal_funcs.inc" +// Generated file, needs to be searched in include paths so that the builddir +// retains priority +#include #undef jl_setjmp #undef jl_longjmp #undef jl_egal @@ -2190,7 +2192,7 @@ JL_DLLEXPORT int jl_generating_output(void) JL_NOTSAFEPOINT; #define JL_OPTIONS_USE_COMPILED_MODULES_NO 0 // Version information -#include "julia_version.h" +#include // Generated file JL_DLLEXPORT extern int jl_ver_major(void); JL_DLLEXPORT extern int jl_ver_minor(void); diff --git a/src/julia_internal.h b/src/julia_internal.h index 6e3b036177c7b..c4ac3e2b35009 100644 --- a/src/julia_internal.h +++ b/src/julia_internal.h @@ -1684,7 +1684,9 @@ JL_DLLEXPORT uint32_t jl_crc32c(uint32_t crc, const char *buf, size_t len); #endif #ifdef USE_DTRACE -#include "uprobes.h.gen" +// Generated file, needs to be searched in include paths so that the builddir +// retains priority +#include // uprobes.h.gen on systems with DTrace, is auto-generated to include // `JL_PROBE_{PROBE}` and `JL_PROBE_{PROBE}_ENABLED()` macros for every probe