Skip to content

Commit e132125

Browse files
authored
check_pie: match nsd support (#253)
* add CHECK_PIE support * update dependencies
1 parent 60ce4d7 commit e132125

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

Makefile.in

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,22 +56,22 @@ maintainer-clean: realclean
5656
devclean: realclean
5757
@rm -rf config.h.in configure
5858

59-
libzone.a: $(OBJECTS) $($(WESTMERE)_OBJECTS) $($(HASWELL)_OBJECTS)
59+
libzone.a: $(OBJECTS) $($(WESTMERE)_OBJECTS) $($(HASWELL)_OBJECTS) Makefile
6060
$(AR) rcs libzone.a $(OBJECTS) $($(WESTMERE)_OBJECTS) $($(HASWELL)_OBJECTS)
6161

6262
$(EXPORT_HEADER):
6363
@mkdir -p include/zone
6464
@echo "#define ZONE_EXPORT" > $(EXPORT_HEADER)
6565

66-
$(WESTMERE_OBJECTS): $(EXPORT_HEADER) .depend
66+
$(WESTMERE_OBJECTS): $(EXPORT_HEADER) .depend Makefile
6767
@mkdir -p src/westmere
6868
$(CC) $(DEPFLAGS) $(CPPFLAGS) $(CFLAGS) -march=westmere -o $@ -c $(SOURCE)/$(@:.o=.c)
6969

70-
$(HASWELL_OBJECTS): $(EXPORT_HEADER) .depend
70+
$(HASWELL_OBJECTS): $(EXPORT_HEADER) .depend Makefile
7171
@mkdir -p src/haswell
7272
$(CC) $(DEPFLAGS) $(CPPFLAGS) $(CFLAGS) -march=haswell -o $@ -c $(SOURCE)/$(@:.o=.c)
7373

74-
$(OBJECTS): $(EXPORT_HEADER) .depend
74+
$(OBJECTS): $(EXPORT_HEADER) .depend Makefile
7575
@mkdir -p src/fallback
7676
$(CC) $(DEPFLAGS) $(CPPFLAGS) $(CFLAGS) -o $@ -c $(SOURCE)/$(@:.o=.c)
7777
@touch $@

configure.ac

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ AC_CONFIG_FILES([Makefile])
1818
m4_include(m4/ax_check_compile_flag.m4)
1919
m4_version_prereq([2.70], [AC_PROG_CC], [AC_PROG_CC_STDC])
2020

21+
# Include PIE support from parent
22+
m4_include(../acx_nlnetlabs.m4)
23+
ACX_CHECK_PIE
24+
2125
AC_CHECK_HEADERS([endian.h sys/endian.h],,, [AC_INCLUDES_DEFAULT])
2226
AC_CHECK_DECLS([bswap16,bswap32,bswap64], [], [], [
2327
AC_INCLUDES_DEFAULT

0 commit comments

Comments
 (0)