diff options
| author | jimb <jimb@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2007-04-12 01:30:57 +0000 |
|---|---|---|
| committer | jimb <jimb@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2007-04-12 01:30:57 +0000 |
| commit | 6080b20706f76eac98b9bde1669481ec22da2196 (patch) | |
| tree | 2491e3990dae82c0fb2506f18bae8f487e8faefc /libc | |
| parent | d95b027c933b1c5dac5f92cf8f5397f7486dd0ac (diff) | |
| download | eglibc2-6080b20706f76eac98b9bde1669481ec22da2196.tar.gz | |
* option-groups.mak: Use '../' if $(..) is unset.
git-svn-id: svn://svn.eglibc.org/trunk@1952 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/ChangeLog.eglibc | 4 | ||||
| -rw-r--r-- | libc/option-groups.mak | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libc/ChangeLog.eglibc b/libc/ChangeLog.eglibc index c6e4d17ac..1f257edfd 100644 --- a/libc/ChangeLog.eglibc +++ b/libc/ChangeLog.eglibc @@ -1,3 +1,7 @@ +2007-04-11 Jim Blandy <jimb@codesourcery.com> + + * option-groups.mak: Use '../' if $(..) is unset. + 2007-03-31 Jim Blandy <jimb@codesourcery.com> Add the OPTION_EGLIBC_LIBM option group. diff --git a/libc/option-groups.mak b/libc/option-groups.mak index 54176bd4d..7866e3321 100644 --- a/libc/option-groups.mak +++ b/libc/option-groups.mak @@ -8,7 +8,8 @@ option_group_config_file ?= $(objdir)/option-groups.config # Read the default settings for all options. -include $(..)option-groups.defaults +# We're included before ../Rules, so we can't assume $(..) is set. +include $(firstword $(..) ../)option-groups.defaults # Read the developer's option group selections, overriding the # defaults from option-groups.defaults. |