summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config_host.mk.in2
-rw-r--r--configure.ac52
-rw-r--r--solenv/gbuild/platform/IOS_ARM_GCC.mk3
-rw-r--r--solenv/gbuild/platform/WNT_INTEL_GCC.mk2
-rw-r--r--solenv/gbuild/platform/macosx.mk2
-rw-r--r--solenv/gbuild/platform/solaris.mk2
-rw-r--r--solenv/gbuild/platform/unxgcc.mk2
7 files changed, 17 insertions, 48 deletions
diff --git a/config_host.mk.in b/config_host.mk.in
index c3d97d655a9d..cd0fc3735e9d 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -492,9 +492,7 @@ export SERVLETAPI_JAR=@SERVLETAPI_JAR@
export SHOWINCLUDES_PREFIX=@SHOWINCLUDES_PREFIX@
export SOLARENV=@SRC_ROOT@/solenv
export SOLARINC=@SOLARINC@
-export SOLARINC_FOR_BUILD=@SOLARINC_FOR_BUILD@
export SOLARLIB=@SOLARLIB@
-export SOLARLIB_FOR_BUILD=@SOLARLIB_FOR_BUILD@
export SOLARVER=@SOLARVER@
export SOLARVERSION=@SOLARVER@
export SOLAR_JAVA=@SOLAR_JAVA@
diff --git a/configure.ac b/configure.ac
index 257ea3474d49..7b0470572da9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3375,9 +3375,7 @@ aix*)
PLATFORMID=aix_powerpc
OUTPATH=unxaigppc
P_SEP=:
- SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
- SOLARLIB="$SOLARLIB -L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
- SOLARLIB="$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib"
+ SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
;;
cygwin*)
@@ -3410,8 +3408,7 @@ cygwin*)
;;
esac
SCPDEFS="$SCPDEFS -D_MSC_VER"
- SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
- SOLARLIB="$SOLARLIB -L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
+ SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
;;
darwin*)
@@ -3496,9 +3493,7 @@ dragonfly*)
AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
;;
esac
- SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
- SOLARLIB="$SOLARLIB -L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
- SOLARLIB="$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib"
+ SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
;;
freebsd*)
@@ -3528,9 +3523,7 @@ freebsd*)
AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
;;
esac
- SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
- SOLARLIB="$SOLARLIB -L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
- SOLARLIB="$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib"
+ SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
;;
kfreebsd*)
@@ -3562,9 +3555,7 @@ kfreebsd*)
AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
;;
esac
- SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
- SOLARLIB="$SOLARLIB -L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
- SOLARLIB="$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib"
+ SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
;;
linux-gnu*)
@@ -3708,9 +3699,7 @@ linux-gnu*)
AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
;;
esac
- SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
- SOLARLIB="$SOLARLIB -L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
- SOLARLIB="$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib"
+ SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
;;
linux-android*)
@@ -3781,8 +3770,7 @@ mingw*)
;;
esac
SOLARINC="$SOLARINC -I$SRC_ROOT/solenv/inc/win32 -I$SRC_ROOT/solenv/inc/$OUTPATH"
- SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
- SOLARLIB="$SOLARLIB -L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
+ SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
;;
*netbsd*)
@@ -3824,9 +3812,7 @@ mingw*)
AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
;;
esac
- SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
- SOLARLIB="$SOLARLIB -L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
- SOLARLIB="$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib"
+ SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
;;
openbsd*)
@@ -3856,9 +3842,7 @@ openbsd*)
;;
esac
SOLARINC="$SOLARINC -I/usr/local/include"
- SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
- SOLARLIB="$SOLARLIB -L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
- SOLARLIB="$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib"
+ SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
SOLARLIB="$SOLARLIB -L/usr/local/lib"
;;
@@ -3892,9 +3876,7 @@ solaris*)
;;
esac
SOLARINC="$SOLARINC -I/usr/local/include"
- SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
- SOLARLIB="$SOLARLIB -L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
- SOLARLIB="$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib"
+ SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
SOLARLIB="$SOLARLIB -L$COMPATH/lib"
SOLARLIB="$SOLARLIB -L/usr/local/bin -L/usr/dt/lib -L/usr/openwin/lib"
;;
@@ -4094,7 +4076,7 @@ if test "$cross_compiling" = "yes"; then
cp config.log ../config.Build.log
mkdir -p ../config_build
cp config_host/*.h ../config_build
- . ./bin/get_config_variables COM GUI OS PATH CPU CPUNAME CC CXX DISABLE_PYTHON MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH PYTHON SYSTEM_LIBXSLT OUTDIR SOLARINC SOLARLIB WORKDIR
+ . ./bin/get_config_variables COM GUI OS PATH CPU CPUNAME CC CXX DISABLE_PYTHON MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH PYTHON SYSTEM_LIBXSLT OUTDIR WORKDIR
for V in COM GUI OS CPU CPUNAME CC CXX DISABLE_PYTHON MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \
PYTHON SYSTEM_LIBXSLT; do
@@ -4106,7 +4088,7 @@ if test "$cross_compiling" = "yes"; then
fi
done
- for V in OUTDIR SOLARINC SOLARLIB WORKDIR; do
+ for V in OUTDIR WORKDIR; do
VV='$'$V
VV=`eval "echo $VV"`
VV=`echo $VV | sed -e 's,/CONF-FOR-BUILD,,g'`
@@ -11769,16 +11751,6 @@ AC_SUBST(BUILD_TYPE)
AC_SUBST(SOLARINC)
AC_SUBST(SOLARLIB)
-if test -z "$SOLARINC_FOR_BUILD"; then
- SOLARINC_FOR_BUILD="$SOLARINC"
-fi
-AC_SUBST(SOLARINC_FOR_BUILD)
-
-if test -z "$SOLARLIB_FOR_BUILD"; then
- SOLARLIB_FOR_BUILD="$SOLARLIB"
-fi
-AC_SUBST(SOLARLIB_FOR_BUILD)
-
PathFormat "$PERL"
PERL="$formatted_path"
AC_SUBST(PERL)
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index e29a9bf67c1f..1a3737ebc385 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -75,8 +75,7 @@ gb_OBJCFLAGS := -x objective-c $(gb_OBJC_OBJCXX_COMMON_FLAGS)
gb_COMPILERDEFS += \
-DBOOST_DETAIL_NO_CONTAINER_FWD
-gb_LinkTarget_LDFLAGS := \
- $(subst -L../lib , ,$(SOLARLIB)) \
+gb_LinkTarget_LDFLAGS := $(SOLARLIB) \
#man ld says: obsolete -Wl,-multiply_defined,suppress \
gb_DEBUG_CFLAGS := -g -fno-inline
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index b70e84b46eb5..533aef8d691a 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -95,7 +95,7 @@ gb_LinkTarget_LDFLAGS := \
-Wl,--exclude-symbols,__main \
-Wl,--enable-stdcall-fixup \
-Wl,--enable-runtime-pseudo-reloc-v2 \
- $(subst -L../lib , ,$(SOLARLIB)) \
+ $(SOLARLIB) \
ifeq ($(MINGW_GCCLIB_EH),YES)
gb_LinkTarget_LDFLAGS += -shared-libgcc
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index c770d9094d46..4065fa012370 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -89,7 +89,7 @@ gb_OBJCFLAGS := -x objective-c -fobjc-exceptions
gb_LinkTarget_LDFLAGS := \
$(if $(filter 1040 1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),-Wl$(COMMA)-syslibroot$(COMMA)$(gb_SDKDIR)) \
- $(subst -L../lib , ,$(SOLARLIB)) \
+ $(SOLARLIB) \
#man ld says: obsolete -Wl,-multiply_defined,suppress \
gb_DEBUG_CFLAGS := -g
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index d7a14c53c8e2..1cc130cb27cd 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -125,7 +125,7 @@ gb_LinkTarget_LDFLAGS += \
-L$(SYSBASE)/lib \
-L$(SYSBASE)/usr/lib \
-Wl,-z,combreloc \
- $(subst -L../lib , ,$(SOLARLIB)) \
+ $(SOLARLIB) \
ifeq ($(HAVE_LD_HASH_STYLE),TRUE)
gb_LinkTarget_LDFLAGS += \
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 63aafda7de0e..5f32825790ee 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -120,7 +120,7 @@ endif
gb_LinkTarget_LDFLAGS += \
-Wl,-rpath-link,$(SYSBASE)/lib:$(SYSBASE)/usr/lib \
-Wl,-z,combreloc \
- $(subst -L../lib , ,$(SOLARLIB)) \
+ $(SOLARLIB) \
ifeq ($(HAVE_LD_HASH_STYLE),TRUE)
gb_LinkTarget_LDFLAGS += \
generated by cgit (git 2.34.1) at 2024-10-27 00:44:34 +0000