Skip to content

Commit 1286f69

Browse files
ianlancetaylorianlancetaylor
committed
libbacktrace: only run dsymutil with Mach-O
libbacktrace/ChangeLog: PR libbacktrace/97227 * configure.ac (USE_DSYMUTIL): Define instead of HAVE_DSYMUTIL. * Makefile.am: Change all uses of HAVE_DSYMUTIL to USE_DSYMUTIL. * configure: Regenerate. * Makefile.in: Regenerate.
1 parent 95e8e96 commit 1286f69

File tree

4 files changed

+46
-44
lines changed

4 files changed

+46
-44
lines changed

‎Makefile.am

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,12 @@ check_DATA =
101101
# Flags to use when compiling test programs.
102102
libbacktrace_TEST_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) -g
103103

104-
if HAVE_DSYMUTIL
104+
if USE_DSYMUTIL
105105

106106
%.dSYM: %
107107
$(DSYMUTIL) $<
108108

109-
endif HAVE_DSYMUTIL
109+
endif USE_DSYMUTIL
110110

111111
if NATIVE
112112
check_LTLIBRARIES = libbacktrace_alloc.la
@@ -238,9 +238,9 @@ allocfail.sh: allocfail
238238

239239
TESTS += allocfail.sh
240240

241-
if HAVE_DSYMUTIL
241+
if USE_DSYMUTIL
242242
check_DATA += allocfail.dSYM
243-
endif HAVE_DSYMUTIL
243+
endif USE_DSYMUTIL
244244

245245
if HAVE_ELF
246246
if HAVE_OBJCOPY_DEBUGLINK
@@ -274,9 +274,9 @@ btest_LDADD = libbacktrace.la
274274

275275
BUILDTESTS += btest
276276

277-
if HAVE_DSYMUTIL
277+
if USE_DSYMUTIL
278278
check_DATA += btest.dSYM
279-
endif HAVE_DSYMUTIL
279+
endif USE_DSYMUTIL
280280

281281
if HAVE_ELF
282282

@@ -294,9 +294,9 @@ btest_alloc_LDADD = libbacktrace_alloc.la
294294

295295
BUILDTESTS += btest_alloc
296296

297-
if HAVE_DSYMUTIL
297+
if USE_DSYMUTIL
298298
check_DATA += btest_alloc.dSYM
299-
endif HAVE_DSYMUTIL
299+
endif USE_DSYMUTIL
300300

301301
if HAVE_DWZ
302302

@@ -324,19 +324,19 @@ stest_LDADD = libbacktrace.la
324324

325325
BUILDTESTS += stest
326326

327-
if HAVE_DSYMUTIL
327+
if USE_DSYMUTIL
328328
check_DATA += stest.dSYM
329-
endif HAVE_DSYMUTIL
329+
endif USE_DSYMUTIL
330330

331331
stest_alloc_SOURCES = $(stest_SOURCES)
332332
stest_alloc_CFLAGS = $(libbacktrace_TEST_CFLAGS)
333333
stest_alloc_LDADD = libbacktrace_alloc.la
334334

335335
BUILDTESTS += stest_alloc
336336

337-
if HAVE_DSYMUTIL
337+
if USE_DSYMUTIL
338338
check_DATA += stest_alloc.dSYM
339-
endif HAVE_DSYMUTIL
339+
endif USE_DSYMUTIL
340340

341341
if HAVE_ELF
342342

@@ -367,17 +367,17 @@ edtest_LDADD = libbacktrace.la
367367

368368
BUILDTESTS += edtest
369369

370-
if HAVE_DSYMUTIL
370+
if USE_DSYMUTIL
371371
check_DATA += edtest.dSYM
372-
endif HAVE_DSYMUTIL
372+
endif USE_DSYMUTIL
373373

374374
edtest_alloc_SOURCES = $(edtest_SOURCES)
375375
edtest_alloc_CFLAGS = $(libbacktrace_TEST_CFLAGS)
376376
edtest_alloc_LDADD = libbacktrace_alloc.la
377377

378-
if HAVE_DSYMUTIL
378+
if USE_DSYMUTIL
379379
check_DATA += edtest_alloc.dSYM
380-
endif HAVE_DSYMUTIL
380+
endif USE_DSYMUTIL
381381

382382
BUILDTESTS += edtest_alloc
383383

@@ -395,19 +395,19 @@ ttest_SOURCES = ttest.c testlib.c
395395
ttest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -pthread
396396
ttest_LDADD = libbacktrace.la
397397

398-
if HAVE_DSYMUTIL
398+
if USE_DSYMUTIL
399399
check_DATA += ttest.dSYM
400-
endif HAVE_DSYMUTIL
400+
endif USE_DSYMUTIL
401401

402402
BUILDTESTS += ttest_alloc
403403

404404
ttest_alloc_SOURCES = $(ttest_SOURCES)
405405
ttest_alloc_CFLAGS = $(ttest_CFLAGS)
406406
ttest_alloc_LDADD = libbacktrace_alloc.la
407407

408-
if HAVE_DSYMUTIL
408+
if USE_DSYMUTIL
409409
check_DATA += ttest_alloc.dSYM
410-
endif HAVE_DSYMUTIL
410+
endif USE_DSYMUTIL
411411

412412
endif HAVE_PTHREAD
413413

@@ -463,19 +463,19 @@ dwarf5_LDADD = libbacktrace.la
463463

464464
BUILDTESTS += dwarf5
465465

466-
if HAVE_DSYMUTIL
466+
if USE_DSYMUTIL
467467
check_DATA += dwarf5.dSYM
468-
endif HAVE_DSYMUTIL
468+
endif USE_DSYMUTIL
469469

470470
dwarf5_alloc_SOURCES = $(dwarf5_SOURCES)
471471
dwarf5_alloc_CFLAGS = $(dwarf5_CFLAGS)
472472
dwarf5_alloc_LDADD = libbacktrace_alloc.la
473473

474474
BUILDTESTS += dwarf5_alloc
475475

476-
if HAVE_DSYMUTIL
476+
if USE_DSYMUTIL
477477
check_DATA += dwarf5_alloc.dSYM
478-
endif HAVE_DSYMUTIL
478+
endif USE_DSYMUTIL
479479

480480
endif
481481

‎Makefile.in

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,10 @@ TESTS = $(am__append_4) $(am__append_7) $(am__append_9) \
132132
@NATIVE_TRUE@ test_unknown unittest unittest_alloc btest
133133
@NATIVE_TRUE@am__append_3 = allocfail
134134
@NATIVE_TRUE@am__append_4 = allocfail.sh
135-
@HAVE_DSYMUTIL_TRUE@@NATIVE_TRUE@am__append_5 = allocfail.dSYM \
136-
@HAVE_DSYMUTIL_TRUE@@NATIVE_TRUE@ btest.dSYM btest_alloc.dSYM \
137-
@HAVE_DSYMUTIL_TRUE@@NATIVE_TRUE@ stest.dSYM stest_alloc.dSYM \
138-
@HAVE_DSYMUTIL_TRUE@@NATIVE_TRUE@ edtest.dSYM edtest_alloc.dSYM
135+
@NATIVE_TRUE@@USE_DSYMUTIL_TRUE@am__append_5 = allocfail.dSYM \
136+
@NATIVE_TRUE@@USE_DSYMUTIL_TRUE@ btest.dSYM btest_alloc.dSYM \
137+
@NATIVE_TRUE@@USE_DSYMUTIL_TRUE@ stest.dSYM stest_alloc.dSYM \
138+
@NATIVE_TRUE@@USE_DSYMUTIL_TRUE@ edtest.dSYM edtest_alloc.dSYM
139139
@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__append_6 = b2test
140140
@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__append_7 = b2test_buildid
141141
@HAVE_DWZ_TRUE@@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__append_8 = b3test
@@ -149,15 +149,17 @@ TESTS = $(am__append_4) $(am__append_7) $(am__append_9) \
149149
@HAVE_ELF_TRUE@@NATIVE_TRUE@am__append_16 = ztest ztest_alloc
150150
@NATIVE_TRUE@am__append_17 = edtest edtest_alloc
151151
@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@am__append_18 = ttest ttest_alloc
152-
@HAVE_DSYMUTIL_TRUE@@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@am__append_19 = ttest.dSYM \
153-
@HAVE_DSYMUTIL_TRUE@@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@ ttest_alloc.dSYM
152+
@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@@USE_DSYMUTIL_TRUE@am__append_19 = \
153+
@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@@USE_DSYMUTIL_TRUE@ ttest.dSYM \
154+
@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@@USE_DSYMUTIL_TRUE@ ttest_alloc.dSYM
154155
@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__append_20 = btest_gnudebuglink
155156
@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@am__append_21 = ctestg ctesta \
156157
@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctestg_alloc \
157158
@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctesta_alloc
158159
@HAVE_DWARF5_TRUE@@NATIVE_TRUE@am__append_22 = dwarf5 dwarf5_alloc
159-
@HAVE_DSYMUTIL_TRUE@@HAVE_DWARF5_TRUE@@NATIVE_TRUE@am__append_23 = dwarf5.dSYM \
160-
@HAVE_DSYMUTIL_TRUE@@HAVE_DWARF5_TRUE@@NATIVE_TRUE@ dwarf5_alloc.dSYM
160+
@HAVE_DWARF5_TRUE@@NATIVE_TRUE@@USE_DSYMUTIL_TRUE@am__append_23 = \
161+
@HAVE_DWARF5_TRUE@@NATIVE_TRUE@@USE_DSYMUTIL_TRUE@ dwarf5.dSYM \
162+
@HAVE_DWARF5_TRUE@@NATIVE_TRUE@@USE_DSYMUTIL_TRUE@ dwarf5_alloc.dSYM
161163
@NATIVE_TRUE@am__append_24 = mtest
162164
@HAVE_MINIDEBUG_TRUE@@NATIVE_TRUE@am__append_25 = mtest_minidebug
163165
@HAVE_ELF_TRUE@@HAVE_LIBLZMA_TRUE@am__append_26 = -llzma
@@ -2418,8 +2420,8 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
24182420
.PRECIOUS: Makefile
24192421

24202422

2421-
@HAVE_DSYMUTIL_TRUE@%.dSYM: %
2422-
@HAVE_DSYMUTIL_TRUE@ $(DSYMUTIL) $<
2423+
@USE_DSYMUTIL_TRUE@%.dSYM: %
2424+
@USE_DSYMUTIL_TRUE@ $(DSYMUTIL) $<
24232425

24242426
@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@elf_for_test.c: elf.c
24252427
@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@ SEARCH='^#define SYSTEM_BUILD_ID_DIR.*$$'; \

‎configure

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -645,8 +645,8 @@ COMM
645645
HAVE_XZ_FALSE
646646
HAVE_XZ_TRUE
647647
XZ
648-
HAVE_DSYMUTIL_FALSE
649-
HAVE_DSYMUTIL_TRUE
648+
USE_DSYMUTIL_FALSE
649+
USE_DSYMUTIL_TRUE
650650
HAVE_OBJCOPY_DEBUGLINK_FALSE
651651
HAVE_OBJCOPY_DEBUGLINK_TRUE
652652
READELF
@@ -12947,12 +12947,12 @@ $as_echo "no" >&6; }
1294712947
fi
1294812948
1294912949
12950-
if test -n "${DSYMUTIL}"; then
12951-
HAVE_DSYMUTIL_TRUE=
12952-
HAVE_DSYMUTIL_FALSE='#'
12950+
if test -n "${DSYMUTIL}" -a "$FORMAT_FILE" = "macho.lo"; then
12951+
USE_DSYMUTIL_TRUE=
12952+
USE_DSYMUTIL_FALSE='#'
1295312953
else
12954-
HAVE_DSYMUTIL_TRUE='#'
12955-
HAVE_DSYMUTIL_FALSE=
12954+
USE_DSYMUTIL_TRUE='#'
12955+
USE_DSYMUTIL_FALSE=
1295612956
fi
1295712957
1295812958
@@ -13358,8 +13358,8 @@ if test -z "${HAVE_OBJCOPY_DEBUGLINK_TRUE}" && test -z "${HAVE_OBJCOPY_DEBUGLINK
1335813358
as_fn_error $? "conditional \"HAVE_OBJCOPY_DEBUGLINK\" was never defined.
1335913359
Usually this means the macro was only invoked conditionally." "$LINENO" 5
1336013360
fi
13361-
if test -z "${HAVE_DSYMUTIL_TRUE}" && test -z "${HAVE_DSYMUTIL_FALSE}"; then
13362-
as_fn_error $? "conditional \"HAVE_DSYMUTIL\" was never defined.
13361+
if test -z "${USE_DSYMUTIL_TRUE}" && test -z "${USE_DSYMUTIL_FALSE}"; then
13362+
as_fn_error $? "conditional \"USE_DSYMUTIL\" was never defined.
1336313363
Usually this means the macro was only invoked conditionally." "$LINENO" 5
1336413364
fi
1336513365
if test -z "${HAVE_XZ_TRUE}" && test -z "${HAVE_XZ_FALSE}"; then

‎configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ AM_CONDITIONAL(HAVE_OBJCOPY_DEBUGLINK, test "$libbacktrace_cv_objcopy_debuglink"
506506

507507
AC_ARG_VAR(DSYMUTIL, [location of dsymutil])
508508
AC_CHECK_PROG(DSYMUTIL, dsymutil, dsymutil)
509-
AM_CONDITIONAL(HAVE_DSYMUTIL, test -n "${DSYMUTIL}")
509+
AM_CONDITIONAL(USE_DSYMUTIL, test -n "${DSYMUTIL}" -a "$FORMAT_FILE" = "macho.lo")
510510

511511
AC_ARG_VAR(NM, [location of nm])
512512
AC_CHECK_PROG(NM, nm, nm)

0 commit comments

Comments
 (0)