Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix probing name of the C compiler in configure #10679

Merged
merged 2 commits into from
Oct 6, 2021
Merged

Fix probing name of the C compiler in configure #10679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4d6410
Allow for gcc with prefixes in configure
dra27 Oct 5, 2021
f1be534
Use $cc_basename in configure for detection
dra27 Oct 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions Changes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,11 @@ Working version
- #10659: Fix freshening substitutions on imported modules
(Leo White and Stephen Dolan, review by Matthew Ryan)

- #10677, #10679: Fix detection of CC as gcc in configure (allow for
triplet-prefixed GCC) and fix all C compiler detection when CC is a path
rather than a basename.
(David Allsopp, report by Fabian @copy, review by Gabriel Scherer)

OCaml 4.13 maintenance branch
-----------------------------

Expand Down
22 changes: 11 additions & 11 deletions configure
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 11 additions & 11 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,7 @@ AS_CASE([$flexdir,$supports_shared_libraries,$flexlink,$host],
[,*,,*-w64-mingw32|,*,,*-pc-windows],
[AC_MSG_ERROR([flexlink is required for native Win32])])

AS_CASE([$CC,$host],
AS_CASE([$cc_basename,$host],
[*,*-*-darwin*],
[mkexe="$mkexe -Wl,-no_compact_unwind";
AC_DEFINE([HAS_ARCH_CODE32], [1])],
Expand Down Expand Up @@ -963,8 +963,8 @@ AS_IF([test x"$enable_shared" != "xno"],
[[*-*-linux*|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*\
|*-*-openbsd*|*-*-netbsd*|*-*-dragonfly*|*-*-gnu*|*-*-haiku*]],
[sharedlib_cflags="-fPIC"
AS_CASE([$CC,$host],
[gcc*,powerpc-*-linux*],
AS_CASE([$cc_basename,$host],
[*gcc*,powerpc-*-linux*],
[mksharedlib="$CC -shared -mbss-plt \$(LDFLAGS)"],
[mksharedlib="$CC -shared \$(LDFLAGS)"])
oc_ldflags="$oc_ldflags -Wl,-E"
Expand Down Expand Up @@ -1012,7 +1012,7 @@ AS_IF([test x"$supports_shared_libraries" = 'xtrue'],
[riscv*-*-linux*], [natdynlink=true])])

# Try to work around the Skylake/Kaby Lake processor bug.
AS_CASE(["$CC,$host"],
AS_CASE(["$cc_basename,$host"],
[*gcc*,x86_64-*|*gcc*,i686-*],
[OCAML_CC_HAS_FNO_TREE_VRP
AS_IF([$cc_has_fno_tree_vrp],
Expand Down Expand Up @@ -1132,17 +1132,17 @@ AC_DEFINE_UNQUOTED([OCAML_OS_TYPE], ["$ostype"])

AC_CHECK_TOOL([DIRECT_LD],[ld])
AS_IF([test -z "$PARTIALLD"],
[AS_CASE(["$arch,$CC,$system,$model"],
[amd64,gcc*,macosx,*], [PACKLD_FLAGS=' -arch x86_64'],
[power,gcc*,elf,ppc], [PACKLD_FLAGS=' -m elf32ppclinux'],
[power,gcc*,elf,ppc64], [PACKLD_FLAGS=' -m elf64ppc'],
[power,gcc*,elf,ppc64le], [PACKLD_FLAGS=' -m elf64lppc'],
[AS_CASE(["$arch,$cc_basename,$system,$model"],
[amd64,*gcc*,macosx,*], [PACKLD_FLAGS=' -arch x86_64'],
[power,*gcc*,elf,ppc], [PACKLD_FLAGS=' -m elf32ppclinux'],
[power,*gcc*,elf,ppc64], [PACKLD_FLAGS=' -m elf64ppc'],
[power,*gcc*,elf,ppc64le], [PACKLD_FLAGS=' -m elf64lppc'],
[PACKLD_FLAGS=''])
# The string for PACKLD must be capable of being concatenated with the
# output filename. Don't assume that all C compilers understand GNU -ofoo
# form, so ensure that the definition includes a space at the end (which is
# achieved using the $(EMPTY) expansion trick).
AS_IF([test x"$CC" = "xcl"],
AS_IF([test x"$cc_basename" = "xcl"],
# For the Microsoft C compiler there must be no space at the end of the
# string.
[PACKLD="link -lib -nologo $machine -out:"],
Expand Down Expand Up @@ -1806,7 +1806,7 @@ AS_IF([$native_compiler],
## Frame pointers

AS_IF([test x"$enable_frame_pointers" = "xyes"],
[AS_CASE(["$host,$CC"],
[AS_CASE(["$host,$cc_basename"],
[x86_64-*-linux*,gcc*|x86_64-*-linux*,clang*],
[common_cflags="$common_cflags -g -fno-omit-frame-pointer"
frame_pointers=true
Expand Down