Skip to content

Commit 98aa9b2

Browse files
vchuravyKristofferC
authored andcommitted
Prioritize build_dir for generated headers (#47783)
(cherry picked from commit 0feaf5c)
1 parent 68fcf0c commit 98aa9b2

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
@@ -2140,7 +2142,7 @@ JL_DLLEXPORT int jl_generating_output(void) JL_NOTSAFEPOINT;
21402142
#define JL_OPTIONS_USE_COMPILED_MODULES_NO 0
21412143

21422144
// Version information
2143-
#include "julia_version.h"
2145+
#include <julia_version.h> // Generated file
21442146

21452147
JL_DLLEXPORT extern int jl_ver_major(void);
21462148
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
@@ -1541,7 +1541,9 @@ JL_DLLEXPORT uint16_t julia__truncdfhf2(double param) JL_NOTSAFEPOINT;
15411541
#endif
15421542

15431543
#ifdef USE_DTRACE
1544-
#include "uprobes.h.gen"
1544+
// Generated file, needs to be searched in include paths so that the builddir
1545+
// retains priority
1546+
#include <uprobes.h.gen>
15451547

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

0 commit comments

Comments
 (0)