suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cs configure: improve propoagation of LIBS

Browse Source 
Propagate `LIBS` to rktio's configure, and also move some flags in
`LIBS` that should be in `LDFLAGS`. The immediate result is to repair
the detection of iconv for rktio on FreeBSD.

Closes #3353
This commit is contained in:
Matthew Flatt 2020-08-15 16:21:20 -06:00
parent 61f701dcff
commit a2bc613a4c
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
racket/src/cs/c/configure vendored
View File

@ -4226,14 +4226,16 @@ case "$host_os" in
*freebsd*)
MACH_OS=fb
CFLAGS="${CFLAGS} -I/usr/local/include"
LIBS="${LIBS} -L/usr/local/lib -liconv -lm -lpthread"
LDFLAGS="${LDFLAGS} -L/usr/local/lib"
LIBS="${LIBS} -liconv -lm -lpthread"
CPPFLAGS="${CPPFLAGS} -DELF_FIND_BOOT_SECTION"
ELF_COMP="--expect-elf"
;;
openbsd*)
MACH_OS=ob
CFLAGS="${CFLAGS} -I/usr/local/include"
LIBS="${LIBS} -L/usr/local/lib -liconv -lm -lpthread"
LDFLAGS="${LDFLAGS} -L/usr/local/lib"
LIBS="${LIBS} -liconv -lm -lpthread"
LDFLAGS="${LDFLAGS} -Wl,-zwxneeded"
CPPFLAGS="${CPPFLAGS} -DELF_FIND_BOOT_SECTION"
ELF_COMP="--expect-elf"
@ -5412,6 +5414,7 @@ CPPFLAGS="$CPPFLAGS $PREFLAGS"
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CC="'"'"${CC}"'"'
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CFLAGS="'"'"${CFLAGS}"'"'
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} LDFLAGS="'"'"${LDFLAGS}"'"'
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} LIBS="'"'"${LIBS}"'"'
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} AR="'"'"${AR}"'"'
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} ARFLAGS="'"'"${ARFLAGS}"'"'
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} RANLIB="'"'"${RANLIB}"'"'

7
racket/src/cs/c/configure.ac
View File

@ -194,14 +194,16 @@ case "$host_os" in
*freebsd*)
MACH_OS=fb
CFLAGS="${CFLAGS} -I/usr/local/include"
LIBS="${LIBS} -L/usr/local/lib -liconv -lm -lpthread"
LDFLAGS="${LDFLAGS} -L/usr/local/lib"
LIBS="${LIBS} -liconv -lm -lpthread"
CPPFLAGS="${CPPFLAGS} -DELF_FIND_BOOT_SECTION"
ELF_COMP="--expect-elf"
;;
openbsd*)
MACH_OS=ob
CFLAGS="${CFLAGS} -I/usr/local/include"
LIBS="${LIBS} -L/usr/local/lib -liconv -lm -lpthread"
LDFLAGS="${LDFLAGS} -L/usr/local/lib"
LIBS="${LIBS} -liconv -lm -lpthread"
LDFLAGS="${LDFLAGS} -Wl,-zwxneeded"
CPPFLAGS="${CPPFLAGS} -DELF_FIND_BOOT_SECTION"
ELF_COMP="--expect-elf"
@ -586,6 +588,7 @@ CPPFLAGS="$CPPFLAGS $PREFLAGS"
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CC="'"'"${CC}"'"'
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CFLAGS="'"'"${CFLAGS}"'"'
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} LDFLAGS="'"'"${LDFLAGS}"'"'
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} LIBS="'"'"${LIBS}"'"'
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} AR="'"'"${AR}"'"'
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} ARFLAGS="'"'"${ARFLAGS}"'"'
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} RANLIB="'"'"${RANLIB}"'"'