Skip to content

Commit 0feaf5c

Browse files
authored
Prioritize build_dir for generated headers (#47783)
1 parent 327b7ac commit 0feaf5c

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/julia.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
#define JULIA_H
55

66
#ifdef LIBRARY_EXPORTS
7-
#include "jl_internal_funcs.inc"
7+
// Generated file, needs to be searched in include paths so that the builddir
8+
// retains priority
9+
#include <jl_internal_funcs.inc>
810
#undef jl_setjmp
911
#undef jl_longjmp
1012
#undef jl_egal
@@ -2190,7 +2192,7 @@ JL_DLLEXPORT int jl_generating_output(void) JL_NOTSAFEPOINT;
21902192
#define JL_OPTIONS_USE_COMPILED_MODULES_NO 0
21912193

21922194
// Version information
2193-
#include "julia_version.h"
2195+
#include <julia_version.h> // Generated file
21942196

21952197
JL_DLLEXPORT extern int jl_ver_major(void);
21962198
JL_DLLEXPORT extern int jl_ver_minor(void);

src/julia_internal.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1684,7 +1684,9 @@ JL_DLLEXPORT uint32_t jl_crc32c(uint32_t crc, const char *buf, size_t len);
16841684
#endif
16851685

16861686
#ifdef USE_DTRACE
1687-
#include "uprobes.h.gen"
1687+
// Generated file, needs to be searched in include paths so that the builddir
1688+
// retains priority
1689+
#include <uprobes.h.gen>
16881690

16891691
// uprobes.h.gen on systems with DTrace, is auto-generated to include
16901692
// `JL_PROBE_{PROBE}` and `JL_PROBE_{PROBE}_ENABLED()` macros for every probe

0 commit comments

Comments
 (0)