The unpac monorepo manager self-hosting as a monorepo using unpac
configure: cache whether as supports --debug-prefix-map
Note that M4sh reserves the '^as_' prefix for shell variables.
+37
-36
+1
-1
Makefile.config.in
+1
-1
Makefile.config.in
+13
-16
aclocal.m4
+13
-16
aclocal.m4
···
140
140
])
141
141
142
142
AC_DEFUN([OCAML_AS_HAS_DEBUG_PREFIX_MAP], [
143
-
AC_MSG_CHECKING([whether the assembler supports --debug-prefix-map])
143
+
AC_CACHE_CHECK([whether the assembler supports --debug-prefix-map],
144
+
[ocaml_cv_prog_as_debug_prefix_map],
145
+
[OCAML_CC_SAVE_VARIABLES
144
146
145
-
OCAML_CC_SAVE_VARIABLES
147
+
# Modify C-compiler variables to use the assembler
148
+
CC="$AS"
149
+
CFLAGS="--debug-prefix-map old=new -o conftest.$ac_objext"
150
+
CPPFLAGS=""
151
+
ac_ext="S"
152
+
ac_compile='$CC $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
146
153
147
-
# Modify C-compiler variables to use the assembler
148
-
CC="$AS"
149
-
CFLAGS="--debug-prefix-map old=new -o conftest.$ac_objext"
150
-
CPPFLAGS=""
151
-
ac_ext="S"
152
-
ac_compile='$CC $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
153
-
154
-
AC_COMPILE_IFELSE(
155
-
[AC_LANG_SOURCE([
154
+
AC_COMPILE_IFELSE([AC_LANG_SOURCE([
156
155
camlPervasives__loop_1128:
157
156
.file 1 "pervasives.ml"
158
157
.loc 1 193
159
158
])],
160
-
[as_has_debug_prefix_map=true
161
-
AC_MSG_RESULT([yes])],
162
-
[as_has_debug_prefix_map=false
163
-
AC_MSG_RESULT([no])])
159
+
[ocaml_cv_prog_as_debug_prefix_map=true],
160
+
[ocaml_cv_prog_as_debug_prefix_map=false])
164
161
165
-
OCAML_CC_RESTORE_VARIABLES
162
+
OCAML_CC_RESTORE_VARIABLES])
166
163
])
167
164
168
165
AC_DEFUN([OCAML_AS_HAS_CFI_DIRECTIVES], [
+19
-16
configure
+19
-16
configure
···
864
864
build_ocamldebug
865
865
with_debugger
866
866
as_is_cc
867
-
as_has_debug_prefix_map
867
+
ocaml_cv_prog_as_debug_prefix_map
868
868
cc_has_debug_prefix_map
869
869
unix_directory
870
870
unix_library
···
23689
23689
esac
23690
23690
23691
23691
## Does the assembler support debug prefix map and CFI directives
23692
-
as_has_debug_prefix_map=false
23693
23692
asm_cfi_supported=false
23694
23693
if $native_compiler
23695
23694
then :
···
23700
23699
23701
23700
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the assembler supports --debug-prefix-map" >&5
23702
23701
printf %s "checking whether the assembler supports --debug-prefix-map... " >&6; }
23703
-
23702
+
if test ${ocaml_cv_prog_as_debug_prefix_map+y}
23703
+
then :
23704
+
printf %s "(cached) " >&6
23705
+
else $as_nop
23704
23706
23705
23707
saved_CC="$CC"
23706
23708
saved_CFLAGS="$CFLAGS"
···
23714
23716
touch confdefs.h
23715
23717
23716
23718
23717
-
# Modify C-compiler variables to use the assembler
23718
-
CC="$AS"
23719
-
CFLAGS="--debug-prefix-map old=new -o conftest.$ac_objext"
23720
-
CPPFLAGS=""
23721
-
ac_ext="S"
23722
-
ac_compile='$CC $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
23719
+
# Modify C-compiler variables to use the assembler
23720
+
CC="$AS"
23721
+
CFLAGS="--debug-prefix-map old=new -o conftest.$ac_objext"
23722
+
CPPFLAGS=""
23723
+
ac_ext="S"
23724
+
ac_compile='$CC $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
23723
23725
23724
-
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
23726
+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
23725
23727
/* end confdefs.h. */
23726
23728
23727
23729
camlPervasives__loop_1128:
···
23731
23733
_ACEOF
23732
23734
if ac_fn_c_try_compile "$LINENO"
23733
23735
then :
23734
-
as_has_debug_prefix_map=true
23735
-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
23736
-
printf "%s\n" "yes" >&6; }
23736
+
ocaml_cv_prog_as_debug_prefix_map=true
23737
23737
else $as_nop
23738
-
as_has_debug_prefix_map=false
23739
-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
23740
-
printf "%s\n" "no" >&6; }
23738
+
ocaml_cv_prog_as_debug_prefix_map=false
23741
23739
fi
23742
23740
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
23743
23741
···
23751
23749
CC="$saved_CC"
23752
23750
LIBS="$saved_LIBS"
23753
23751
23752
+
fi
23753
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ocaml_cv_prog_as_debug_prefix_map" >&5
23754
+
printf "%s\n" "$ocaml_cv_prog_as_debug_prefix_map" >&6; }
23754
23755
23755
23756
23756
23757
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the assembler supports CFI directives" >&5
···
23861
23862
fi ;;
23862
23863
esac
23863
23864
fi
23865
+
# Always assign a valid default OCaml value
23866
+
: ${ocaml_cv_prog_as_debug_prefix_map:=false}
23864
23867
23865
23868
## Frame pointers
23866
23869
+3
-2
configure.ac
+3
-2
configure.ac
···
223
223
AC_SUBST([unix_library])
224
224
AC_SUBST([unix_directory])
225
225
AC_SUBST([cc_has_debug_prefix_map])
226
-
AC_SUBST([as_has_debug_prefix_map])
226
+
AC_SUBST([ocaml_cv_prog_as_debug_prefix_map])
227
227
AC_SUBST([as_is_cc])
228
228
AC_SUBST([with_debugger]) # TODO: rename this variable
229
229
AC_SUBST([build_ocamldebug])
···
2771
2771
AC_MSG_NOTICE([the threads library is supported])])
2772
2772
2773
2773
## Does the assembler support debug prefix map and CFI directives
2774
-
as_has_debug_prefix_map=false
2775
2774
asm_cfi_supported=false
2776
2775
AS_IF([$native_compiler],
2777
2776
[AS_CASE([$target],
2778
2777
[*-w64-mingw32*|*-pc-windows], [],
2779
2778
[OCAML_AS_HAS_DEBUG_PREFIX_MAP
2780
2779
OCAML_AS_HAS_CFI_DIRECTIVES])])
2780
+
# Always assign a valid default OCaml value
2781
+
: ${ocaml_cv_prog_as_debug_prefix_map:=false}
2781
2782
2782
2783
## Frame pointers
2783
2784
+1
-1
utils/config.generated.ml.in
+1
-1
utils/config.generated.ml.in
···
26
26
let c_compiler_vendor = {@QS@|@ocaml_cc_vendor@|@QS@}
27
27
let c_output_obj = {@QS@|@outputobj@|@QS@}
28
28
let c_has_debug_prefix_map = @cc_has_debug_prefix_map@
29
-
let as_has_debug_prefix_map = @as_has_debug_prefix_map@
29
+
let as_has_debug_prefix_map = @ocaml_cv_prog_as_debug_prefix_map@
30
30
let as_is_cc = @as_is_cc@
31
31
let bytecode_cflags = {@QS@|@bytecode_cflags@|@QS@}
32
32
let bytecode_cppflags = {@QS@|@bytecode_cppflags@|@QS@}