summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@tavianator.com>2022-03-12 22:43:10 -0500
committerTavian Barnes <tavianator@tavianator.com>2022-03-12 22:43:10 -0500
commit64426f1a89450a0f79b723a4d966f7f9c7492c60 (patch)
treeaeb9b990a501e5cc44e05fe26179b4c470b3a592 /Makefile
parent8ad8838d21a133fb8a48e1e88001ca3aed9baf9d (diff)
downloadbfs-64426f1a89450a0f79b723a4d966f7f9c7492c60.tar.xz
Don't shadow standard headers
@italic on the AUR stated that bfs from the AUR fails to build on Manjaro. From the build log, it seems like <time.h> doesn't get included properly. I assume it's picking up ./time.h instead. I couldn't reproduce the build issue in the default configuration, but it does fail with EXTRA_CFLAGS="-I." which isn't good. So rename everything with an x prefix to stop clashing. Link: https://aur.archlinux.org/packages/bfs#comment-856102 Link: https://paste.rs/eqR
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 9ae4bd1..01b2c8d 100644
--- a/Makefile
+++ b/Makefile
@@ -217,17 +217,17 @@ bfs: \
parse.o \
printf.o \
pwcache.o \
- regex.o \
- spawn.o \
stat.o \
- time.o \
trie.o \
typo.o \
- util.o
+ util.o \
+ xregex.o \
+ xspawn.o \
+ xtime.o
tests/mksock: tests/mksock.o
tests/trie: trie.o tests/trie.o
-tests/xtimegm: time.o tests/xtimegm.o
+tests/xtimegm: xtime.o tests/xtimegm.o
$(BIN_GOALS):
+$(CC) $(ALL_LDFLAGS) $^ $(ALL_LDLIBS) -o $@