Makefile: only set some BASIC_CFLAGS when RUNTIME_PREFIX is set
Several build variables only have any meaning when the RUNTIME_PREFIX variable has been set. In particular, the following build variables are otherwise ignored: HAVE_BSD_KERN_PROC_SYSCTL PROCFS_EXECUTABLE_PATH HAVE_NS_GET_EXECUTABLE_PATH HAVE_ZOS_GET_EXECUTABLE_PATH HAVE_WPGMPTR Make setting BASIC_CFLAGS, for each of these variables, conditional on the RUNTIME_PREFIX being defined. Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ramsay Jones committed
Apr 17, 2025 at 00:18 UTC
507c63f96e02a27bdcc2c48377e7b0b9d1981458
1 file changed
+21
-17
Makefile
+21
-17
@@ -2179,10 +2179,6 @@ ifdef HAVE_BSD_SYSCTL
2179
BASIC_CFLAGS += -DHAVE_BSD_SYSCTL
2180
endif
2181
2182
-ifdef HAVE_BSD_KERN_PROC_SYSCTL
2183
- BASIC_CFLAGS += -DHAVE_BSD_KERN_PROC_SYSCTL
2184
-endif
2185
-
2182
ifdef HAVE_GETDELIM
2183
BASIC_CFLAGS += -DHAVE_GETDELIM
2184
endif
@@ -2213,25 +2209,33 @@ ifneq ($(findstring openssl,$(CSPRNG_METHOD)),)
2209
EXTLIBS += -lcrypto -lssl
2210
endif
2211
2216
-ifneq ($(PROCFS_EXECUTABLE_PATH),)
2217
- procfs_executable_path_SQ = $(subst ','\'',$(PROCFS_EXECUTABLE_PATH))
2218
- BASIC_CFLAGS += '-DPROCFS_EXECUTABLE_PATH="$(procfs_executable_path_SQ)"'
2219
-endif
2220
-
2212
ifndef HAVE_PLATFORM_PROCINFO
2213
COMPAT_OBJS += compat/stub/procinfo.o
2214
endif
2215
2225
-ifdef HAVE_NS_GET_EXECUTABLE_PATH
2226
- BASIC_CFLAGS += -DHAVE_NS_GET_EXECUTABLE_PATH
2227
-endif
2216
+ifdef RUNTIME_PREFIX
2217
2229
-ifdef HAVE_ZOS_GET_EXECUTABLE_PATH
2230
- BASIC_CFLAGS += -DHAVE_ZOS_GET_EXECUTABLE_PATH
2231
-endif
2218
+ ifdef HAVE_BSD_KERN_PROC_SYSCTL
2219
+ BASIC_CFLAGS += -DHAVE_BSD_KERN_PROC_SYSCTL
2220
+ endif
2221
+
2222
+ ifneq ($(PROCFS_EXECUTABLE_PATH),)
2223
+ pep_SQ = $(subst ','\'',$(PROCFS_EXECUTABLE_PATH))
2224
+ BASIC_CFLAGS += '-DPROCFS_EXECUTABLE_PATH="$(pep_SQ)"'
2225
+ endif
2226
+
2227
+ ifdef HAVE_NS_GET_EXECUTABLE_PATH
2228
+ BASIC_CFLAGS += -DHAVE_NS_GET_EXECUTABLE_PATH
2229
+ endif
2230
+
2231
+ ifdef HAVE_ZOS_GET_EXECUTABLE_PATH
2232
+ BASIC_CFLAGS += -DHAVE_ZOS_GET_EXECUTABLE_PATH
2233
+ endif
2234
+
2235
+ ifdef HAVE_WPGMPTR
2236
+ BASIC_CFLAGS += -DHAVE_WPGMPTR
2237
+ endif
2238
2233
-ifdef HAVE_WPGMPTR
2234
- BASIC_CFLAGS += -DHAVE_WPGMPTR
2239
endif
2240
2241
ifdef FILENO_IS_A_MACRO