diff options
| author | Steve Huston <shuston@riverace.com> | 2009-06-25 13:28:11 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2009-06-25 13:28:11 +0000 |
| commit | 595288066599a58afd6577988ba481b65bd94612 (patch) | |
| tree | 3a062be02af9aef9cd984585c8db5170f7999cd2 | |
| parent | c3e5d07f1e77469b6274c131136f9c814fe827bd (diff) | |
| download | ATCD-595288066599a58afd6577988ba481b65bd94612.tar.gz | |
ChangeLogTag:Thu Jun 25 13:26:13 UTC 2009 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/include/makeinclude/wrapper_macros.GNU | 10 |
2 files changed, 16 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 76c31c17ef8..f9ba5577d28 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Thu Jun 25 13:26:13 UTC 2009 Steve Huston <shuston@riverace.com> + + * include/makeinclude/wrapper_macros.GNU: Restore pre-5.7 build + functionality for non-MPC-generated Makefiles that use LIB to + specify what library to build. Fixes Bugzilla 3708. + Thu Jun 25 02:09:51 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * rpmbuild/ace-tao-ciao.spec: diff --git a/ACE/include/makeinclude/wrapper_macros.GNU b/ACE/include/makeinclude/wrapper_macros.GNU index b169dc5e2f3..68018aa6af0 100644 --- a/ACE/include/makeinclude/wrapper_macros.GNU +++ b/ACE/include/makeinclude/wrapper_macros.GNU @@ -192,6 +192,16 @@ # (link to the appropriate platform-specific config file). #---------------------------------------------------------------------------- +# User-written makefiles that are not MPC-generated often use LIB to specify +# what to build. This is in contrast to MPC-generated files that use +# LIB_CHECKED for this purpose. LIB causes conflicts on Windows with gmake +# and Visual Studio which uses the LIB environment variable as a search path +# for libraries to link. So, to allow non-MPC makefiles to keep working, set +# LIB_CHECKED based on LIB if the former is not set and the latter is. +ifndef COMSPEC + LIB_CHECKED ?= $(LIB) +endif # ! COMPSPEC (and, therefore, assumed !Windows + # default to not using an architecture specific output directory ARCH ?= ARCH_BIN = $(BIN) |