about summary refs log tree commit diff
path: root/configure
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2015-11-30 17:44:43 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2015-11-30 17:44:43 +0000
commitb8b32b81b482f35f7c36ae9dd266028af613c3dc (patch)
tree3884ea82d3157ff7a0a9acc567f3eda0d4af2aa3 /configure
parent2524544fa0c6ca061b6d22d4e94173a3ee1289c3 (diff)
downloads6-b8b32b81b482f35f7c36ae9dd266028af613c3dc.tar.gz
s6-b8b32b81b482f35f7c36ae9dd266028af613c3dc.tar.xz
s6-b8b32b81b482f35f7c36ae9dd266028af613c3dc.zip
- Fix selfpipe_read() invocation: the return is int, not char
 - Easier CROSS_COMPILE support in configure
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure5
1 files changed, 3 insertions, 2 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