RFR: 8328146: Set LIBCXX automatically [v3]
Erik Joelsson
erikj at openjdk.org
Thu Mar 14 15:59:43 UTC 2024
On Thu, 14 Mar 2024 14:03:07 GMT, Magnus Ihse Bursie <ihse at openjdk.org> wrote:
>> We are adding LIBCXX to LIBS in calls to SetupJdkLibrary whenever LINK_TYPE is C++. We should do this automatically in SetupJdkLibrary for C++ linking.
>>
>> I also removed the superfluous `-lc` from some places where it had been added.
>
> Magnus Ihse Bursie has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. The pull request contains four additional commits since the last revision:
>
> - Merge branch 'master' into set-libcxx-automatically
> - Fix extra space
> - Restore $(LIBCXX) in tests since they don't use SetupJdkLibrary.
> - 8328146: Set LIBCXX automatically
make/modules/java.base/Lib.gmk line 217:
> 215: LDFLAGS_aix := -brtl -bexpfull, \
> 216: LIBS_linux := -lm -ldl, \
> 217: LIBS_aix := -lm -ldecNumber, \
This lib doesn't set LINK_TYPE. Did it add LIBCXX without needing it?
make/modules/jdk.jpackage/Lib.gmk line 132:
> 130: LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
> 131: $(call SET_SHARED_LIBRARY_ORIGIN), \
> 132: LIBS := advapi32.lib ole32.lib msi.lib user32.lib \
Should this (and the others below) be using LINK_TYPE:=C++ or was $(LIBCXX) never actually needed on Windows?
-------------
PR Review Comment: https://git.openjdk.org/jdk/pull/18298#discussion_r1525121261
PR Review Comment: https://git.openjdk.org/jdk/pull/18298#discussion_r1525126108
More information about the build-dev
mailing list