mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2026-01-15 05:43:19 -08:00
Code Issues Projects Releases Packages Wiki Activity

build: fix tabs and don't overwrite gc dir

Browse source 
Signed-off-by: Daniel Kochmański <daniel@turtleware.eu>
This commit is contained in:
Daniel Kochmański 2015-09-26 11:20:04 +02:00
parent df019224f8
commit 7c713d7dd0
2 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/aclocal.m4 vendored
View file

@ -455,7 +455,6 @@ case "${host}" in
THREAD_LIBS='-lpthread'
SHARED_LDFLAGS="-shared ${LDFLAGS}"
BUNDLE_LDFLAGS="-shared ${LDFLAGS}"
ECL_GC_DIR=gc-unstable
ECL_LDRPATH='-Wl,--rpath,~A'
CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 ${CFLAGS}"
SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.SOVERSION"
@ -468,7 +467,6 @@ case "${host}" in
THREAD_LIBS='-lpthread'
dnl SHARED_LDFLAGS="-shared ${LDFLAGS}"
dnl BUNDLE_LDFLAGS="-shared ${LDFLAGS}"
ECL_GC_DIR=gc-unstable
dnl ECL_LDRPATH='-Wl,--rpath,~A'
CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 ${CFLAGS}"
dnl SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.SOVERSION"
@ -1039,10 +1037,10 @@ if test "${enable_boehm}" = "included"; then
if mkdir gc; then
if (destdir=`${PWDCMD}`; cd gc; \
$srcdir/${ECL_GC_DIR}/configure --disable-shared --prefix=${destdir} \
--includedir=${destdir}/ecl/ --libdir=${destdir} --build=${build_alias} \
--host=${host_alias} --enable-large-config \
--includedir=${destdir}/ecl/ --libdir=${destdir} --build=${build_alias} \
--host=${host_alias} --enable-large-config \
CC="${CC} ${PICFLAG}" CFLAGS="$CFLAGS" \
LDFLAGS="$LDFLAGS" CPPFLAGS="$CPPFLAGS" \
LDFLAGS="$LDFLAGS" CPPFLAGS="$CPPFLAGS" \
${boehm_configure_flags}); then
ECL_BOEHM_GC_HEADER='ecl/gc/gc.h'
SUBDIRS="${SUBDIRS} gc"

10
src/configure vendored
View file

@ -5076,7 +5076,6 @@ case "${host}" in
THREAD_LIBS='-lpthread'
SHARED_LDFLAGS="-shared ${LDFLAGS}"
BUNDLE_LDFLAGS="-shared ${LDFLAGS}"
ECL_GC_DIR=gc-unstable
ECL_LDRPATH='-Wl,--rpath,~A'
CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 ${CFLAGS}"
SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.SOVERSION"
@ -5089,8 +5088,7 @@ LSP_FEATURES="(cons :nacl ${LSP_FEATURES})"
thehost='linux'
THREAD_CFLAGS='-D_THREAD_SAFE'
THREAD_LIBS='-lpthread'
ECL_GC_DIR=gc-unstable
CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 ${CFLAGS}"
CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 ${CFLAGS}"
LSP_FEATURES="(cons :nacl ${LSP_FEATURES})"
@ -6139,10 +6137,10 @@ $as_echo "$as_me: Configuring included Boehm GC library:" >&6;}
if mkdir gc; then
if (destdir=`${PWDCMD}`; cd gc; \
$srcdir/${ECL_GC_DIR}/configure --disable-shared --prefix=${destdir} \
--includedir=${destdir}/ecl/ --libdir=${destdir} --build=${build_alias} \
--host=${host_alias} --enable-large-config \
--includedir=${destdir}/ecl/ --libdir=${destdir} --build=${build_alias} \
--host=${host_alias} --enable-large-config \
CC="${CC} ${PICFLAG}" CFLAGS="$CFLAGS" \
LDFLAGS="$LDFLAGS" CPPFLAGS="$CPPFLAGS" \
LDFLAGS="$LDFLAGS" CPPFLAGS="$CPPFLAGS" \
${boehm_configure_flags}); then
ECL_BOEHM_GC_HEADER='ecl/gc/gc.h'
SUBDIRS="${SUBDIRS} gc"