diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2015-11-30 17:48:17 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2015-11-30 17:48:17 +0000 |
| commit | ad3780154bc26266d5a4ed71f12b9c603ca3b0ab (patch) | |
| tree | a512ce975e56d6847bac6aa2c0f19bff51804347 | |
| parent | f231dfc2774dc450ce7d14a139ac25675cd353d7 (diff) | |
| download | s6-linux-utils-ad3780154bc26266d5a4ed71f12b9c603ca3b0ab.tar.gz s6-linux-utils-ad3780154bc26266d5a4ed71f12b9c603ca3b0ab.tar.xz s6-linux-utils-ad3780154bc26266d5a4ed71f12b9c603ca3b0ab.zip | |
- Fix selfpipe_read invocations
- Easier CROSS_COMPILE support in configure
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | src/minutils/s6-uevent-listener.c | 2 | ||||
| -rw-r--r-- | src/minutils/s6-uevent-spawner.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/configure b/configure index 1f9b16e..1fa12db 100755 --- a/configure +++ b/configure @@ -120,7 +120,7 @@ tryldflag () { # Actual script -CC_AUTO="$CC" +CC_AUTO= CFLAGS_AUTO="$CFLAGS" CPPFLAGS_AUTO="-D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -O2 $CPPFLAGS" LDFLAGS_AUTO="$LDFLAGS" @@ -253,6 +253,7 @@ fi # Find a C compiler to use echo "checking for C compiler..." +trycc ${cross}${CC} trycc ${cross}gcc trycc ${cross}c99 trycc ${cross}cc @@ -362,7 +363,7 @@ SYSCLOCK_LIB := ${sysclock_lib} TAINNOW_LIB := ${tainnow_lib} UTIL_LIB := ${util_lib} -CC := $CC_AUTO +CC := ${CC_AUTO##${cross}} CFLAGS := $CFLAGS_AUTO CPPFLAGS := $CPPFLAGS_AUTO LDFLAGS := $LDFLAGS_AUTO diff --git a/src/minutils/s6-uevent-listener.c b/src/minutils/s6-uevent-listener.c index 14a48f1..f6e9c4b 100644 --- a/src/minutils/s6-uevent-listener.c +++ b/src/minutils/s6-uevent-listener.c @@ -55,7 +55,7 @@ static inline void handle_signals (void) { for (;;) { - char c = selfpipe_read() ; + int c = selfpipe_read() ; switch (c) { case -1 : strerr_diefu1sys(111, "selfpipe_read") ; diff --git a/src/minutils/s6-uevent-spawner.c b/src/minutils/s6-uevent-spawner.c index 2880405..6ccc4ce 100644 --- a/src/minutils/s6-uevent-spawner.c +++ b/src/minutils/s6-uevent-spawner.c @@ -106,7 +106,7 @@ static inline void handle_signals (void) { for (;;) { - char c = selfpipe_read() ; + int c = selfpipe_read() ; switch (c) { case -1 : strerr_diefu1sys(111, "selfpipe_read") ; |