configure: switch default from BC to CS
This change brings the top-level makefile and `configure` back in sync, but it affect source distributions by changing the `configure` default there.
This commit is contained in:
parent
093fcd1bc7
commit
e6752e9afc
1
.github/workflows/ci-push_linux.yml
vendored
1
.github/workflows/ci-push_linux.yml
vendored
|
@ -114,6 +114,7 @@ jobs:
|
||||||
./configure
|
./configure
|
||||||
--prefix=/usr/local/racket3m
|
--prefix=/usr/local/racket3m
|
||||||
--enable-werror
|
--enable-werror
|
||||||
|
--enable-bcdefault
|
||||||
--enable-racket=/usr/local/racketcgc/bin/racket
|
--enable-racket=/usr/local/racketcgc/bin/racket
|
||||||
--enable-foreign
|
--enable-foreign
|
||||||
--enable-float
|
--enable-float
|
||||||
|
|
1
.github/workflows/ci-push_macos.yml
vendored
1
.github/workflows/ci-push_macos.yml
vendored
|
@ -99,6 +99,7 @@ jobs:
|
||||||
--prefix=$GITHUB_WORKSPACE/racket3m
|
--prefix=$GITHUB_WORKSPACE/racket3m
|
||||||
$RACKET_EXTRA_CONFIGURE_ARGS
|
$RACKET_EXTRA_CONFIGURE_ARGS
|
||||||
--enable-racket=$GITHUB_WORKSPACE/racketcgc/bin/racket
|
--enable-racket=$GITHUB_WORKSPACE/racketcgc/bin/racket
|
||||||
|
--enable-bcdefault
|
||||||
--enable-jit
|
--enable-jit
|
||||||
--enable-foreign
|
--enable-foreign
|
||||||
--enable-macprefix
|
--enable-macprefix
|
||||||
|
|
1
.github/workflows/ci_win.yml
vendored
1
.github/workflows/ci_win.yml
vendored
|
@ -28,6 +28,7 @@ jobs:
|
||||||
shell: cmd
|
shell: cmd
|
||||||
run: |
|
run: |
|
||||||
call msvcprep.bat x86_amd64
|
call msvcprep.bat x86_amd64
|
||||||
|
set UNDERSCORE_BC_SUFFIX=_
|
||||||
call build.bat
|
call build.bat
|
||||||
- name: Build CS
|
- name: Build CS
|
||||||
working-directory: .\racket\src\worksp
|
working-directory: .\racket\src\worksp
|
||||||
|
|
|
@ -101,6 +101,7 @@ jobs:
|
||||||
./configure
|
./configure
|
||||||
CFLAGS="-O0 -g"
|
CFLAGS="-O0 -g"
|
||||||
CPPFLAGS="-DMZ_PRECISE_RETURN_SPEC"
|
CPPFLAGS="-DMZ_PRECISE_RETURN_SPEC"
|
||||||
|
--enable-bcdefault
|
||||||
--disable-strip
|
--disable-strip
|
||||||
--enable-racket=/usr/bin/racket
|
--enable-racket=/usr/bin/racket
|
||||||
--enable-werror
|
--enable-werror
|
||||||
|
|
|
@ -44,8 +44,8 @@ fi
|
||||||
if test "${enable_csdefault}" = "" ; then
|
if test "${enable_csdefault}" = "" ; then
|
||||||
if test "${enable_bcdefault}" = "" ; then
|
if test "${enable_bcdefault}" = "" ; then
|
||||||
# Pick a default default here, but make it consistent with "src/configure"
|
# Pick a default default here, but make it consistent with "src/configure"
|
||||||
enable_bcdefault=yes
|
enable_csdefault=yes
|
||||||
enable_csdefault=no
|
enable_bcdefault=no
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
4
racket/src/bc/configure
vendored
4
racket/src/bc/configure
vendored
|
@ -3275,8 +3275,8 @@ fi
|
||||||
if test "${enable_csdefault}" = "" ; then
|
if test "${enable_csdefault}" = "" ; then
|
||||||
if test "${enable_bcdefault}" = "" ; then
|
if test "${enable_bcdefault}" = "" ; then
|
||||||
# Pick a default default here, but make it consistent with "src/configure"
|
# Pick a default default here, but make it consistent with "src/configure"
|
||||||
enable_bcdefault=yes
|
enable_csdefault=yes
|
||||||
enable_csdefault=no
|
enable_bcdefault=no
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -2299,8 +2299,8 @@ fi
|
||||||
if test "${enable_csdefault}" = "" ; then
|
if test "${enable_csdefault}" = "" ; then
|
||||||
if test "${enable_bcdefault}" = "" ; then
|
if test "${enable_bcdefault}" = "" ; then
|
||||||
# Pick a default default here, but make it consistent with "src/configure"
|
# Pick a default default here, but make it consistent with "src/configure"
|
||||||
enable_bcdefault=yes
|
enable_csdefault=yes
|
||||||
enable_csdefault=no
|
enable_bcdefault=no
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
8
racket/src/configure
vendored
8
racket/src/configure
vendored
|
@ -54,8 +54,8 @@ done
|
||||||
# Select default build if none specified:
|
# Select default build if none specified:
|
||||||
if test "$use_bc" = maybe ; then
|
if test "$use_bc" = maybe ; then
|
||||||
if test "$use_cs" = maybe ; then
|
if test "$use_cs" = maybe ; then
|
||||||
use_cs=no
|
use_cs=yes
|
||||||
use_bc=yes
|
use_bc=no
|
||||||
elif test "$use_cs" = no ; then
|
elif test "$use_cs" = no ; then
|
||||||
use_bc=yes
|
use_bc=yes
|
||||||
elif test -d "$pb_dir" -o $supplied_racket = yes ; then
|
elif test -d "$pb_dir" -o $supplied_racket = yes ; then
|
||||||
|
@ -70,10 +70,6 @@ elif test "$use_cs" = "maybe" ; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$use_cs" = "yes" ; then
|
if test "$use_cs" = "yes" ; then
|
||||||
# The "cs/c/configure" script doesn't report the installation
|
|
||||||
# configuration, so we run it first and let "cfg-cs" or
|
|
||||||
# "cfg-bc" report that information.
|
|
||||||
|
|
||||||
if test $use_bc = no -a $supplied_racket = no -a ! -d "$pb_dir" ; then
|
if test $use_bc = no -a $supplied_racket = no -a ! -d "$pb_dir" ; then
|
||||||
echo $0: must have $pb_dir or --enable-racket=... for --enable-csonly
|
echo $0: must have $pb_dir or --enable-racket=... for --enable-csonly
|
||||||
exit 1
|
exit 1
|
||||||
|
|
4
racket/src/cs/c/configure
vendored
4
racket/src/cs/c/configure
vendored
|
@ -2845,8 +2845,8 @@ fi
|
||||||
if test "${enable_csdefault}" = "" ; then
|
if test "${enable_csdefault}" = "" ; then
|
||||||
if test "${enable_bcdefault}" = "" ; then
|
if test "${enable_bcdefault}" = "" ; then
|
||||||
# Pick a default default here, but make it consistent with "src/configure"
|
# Pick a default default here, but make it consistent with "src/configure"
|
||||||
enable_bcdefault=yes
|
enable_csdefault=yes
|
||||||
enable_csdefault=no
|
enable_bcdefault=no
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user