Skip to content

Commit f5d708f

Browse files
libgo: update configure.ac to upstream GCC
The libgo/configure.ac file in upstream GCC was changed in https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=6a6d3817afa02bbcd2388c8e005da6faf88932f1 This adds an automake conditional that is not used, but will be used in the future when and if libgo is ported to Darwin. This CL makes the corresponding change in this repo. Change-Id: Ieac8e85620993b1d3b55a89bbb61047e6ff9031f Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/546435 Reviewed-by: Cherry Mui <[email protected]> Reviewed-by: Than McIntosh <[email protected]>
1 parent e997b02 commit f5d708f

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

Diff for: libgo/configure

+17-2
Original file line numberDiff line numberDiff line change
@@ -709,6 +709,8 @@ glibgo_toolexecdir
709709
WERROR
710710
WARN_FLAGS
711711
CC_FOR_BUILD
712+
ENABLE_DARWIN_AT_RPATH_FALSE
713+
ENABLE_DARWIN_AT_RPATH_TRUE
712714
enable_static
713715
enable_shared
714716
CPP
@@ -11545,7 +11547,7 @@ else
1154511547
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1154611548
lt_status=$lt_dlunknown
1154711549
cat > conftest.$ac_ext <<_LT_EOF
11548-
#line 11548 "configure"
11550+
#line 11550 "configure"
1154911551
#include "confdefs.h"
1155011552

1155111553
#if HAVE_DLFCN_H
@@ -11651,7 +11653,7 @@ else
1165111653
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1165211654
lt_status=$lt_dlunknown
1165311655
cat > conftest.$ac_ext <<_LT_EOF
11654-
#line 11654 "configure"
11656+
#line 11656 "configure"
1165511657
#include "confdefs.h"
1165611658

1165711659
#if HAVE_DLFCN_H
@@ -13780,6 +13782,14 @@ CC="$lt_save_CC"
1378013782

1378113783

1378213784

13785+
if test x$enable_darwin_at_rpath = xyes; then
13786+
ENABLE_DARWIN_AT_RPATH_TRUE=
13787+
ENABLE_DARWIN_AT_RPATH_FALSE='#'
13788+
else
13789+
ENABLE_DARWIN_AT_RPATH_TRUE='#'
13790+
ENABLE_DARWIN_AT_RPATH_FALSE=
13791+
fi
13792+
1378313793

1378413794
CC_FOR_BUILD=${CC_FOR_BUILD:-gcc}
1378513795

@@ -14399,6 +14409,7 @@ esac
1439914409

1440014410
test -z "$HWCAP_CFLAGS" && HWCAP_CFLAGS=''
1440114411

14412+
1440214413
# Restrict the test to Solaris, other assemblers (e.g. AIX as) have -nH
1440314414
# with a different meaning.
1440414415
case ${target_os} in
@@ -16389,6 +16400,10 @@ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
1638916400
as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
1639016401
Usually this means the macro was only invoked conditionally." "$LINENO" 5
1639116402
fi
16403+
if test -z "${ENABLE_DARWIN_AT_RPATH_TRUE}" && test -z "${ENABLE_DARWIN_AT_RPATH_FALSE}"; then
16404+
as_fn_error $? "conditional \"ENABLE_DARWIN_AT_RPATH\" was never defined.
16405+
Usually this means the macro was only invoked conditionally." "$LINENO" 5
16406+
fi
1639216407
if test -z "${USE_LIBFFI_TRUE}" && test -z "${USE_LIBFFI_FALSE}"; then
1639316408
as_fn_error $? "conditional \"USE_LIBFFI\" was never defined.
1639416409
Usually this means the macro was only invoked conditionally." "$LINENO" 5

Diff for: libgo/configure.ac

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ AC_LIBTOOL_DLOPEN
5353
AM_PROG_LIBTOOL
5454
AC_SUBST(enable_shared)
5555
AC_SUBST(enable_static)
56+
AM_CONDITIONAL([ENABLE_DARWIN_AT_RPATH], [test x$enable_darwin_at_rpath = xyes])
5657

5758
CC_FOR_BUILD=${CC_FOR_BUILD:-gcc}
5859
AC_SUBST(CC_FOR_BUILD)

0 commit comments

Comments
 (0)