diff options
| author | mcorino <mcorino@users.noreply.github.com> | 2004-11-18 19:11:31 +0000 |
|---|---|---|
| committer | mcorino <mcorino@users.noreply.github.com> | 2004-11-18 19:11:31 +0000 |
| commit | 2d595749d4ed5cf27b7fb554fa9a17473b842651 (patch) | |
| tree | 1dc9df8f0e4b760884b2c40df11bf30a3d288c13 | |
| parent | a21f7997363e553a7f27795337318a170f17d920 (diff) | |
| download | ATCD-2d595749d4ed5cf27b7fb554fa9a17473b842651.tar.gz | |
ChangeLogTag: Thu Nov 18 19:08:12 UTC 2004 Martin Corino <mcorino@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/rules.tao.GNU | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 2c0b7ac1f5a..148140478e2 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Thu Nov 18 19:08:12 UTC 2004 Martin Corino <mcorino@remedy.nl> + + * rules.tao.GNU: + Fixed correct setting of TAO_IDL_DEP for crossbuilds. + Thu Nov 18 12:44:34 2004 Chad Elliott <elliott_c@ociweb.com> * tao/RTScheduling/Current.cpp: diff --git a/TAO/rules.tao.GNU b/TAO/rules.tao.GNU index 124f3822782..8ce6fafae99 100644 --- a/TAO/rules.tao.GNU +++ b/TAO/rules.tao.GNU @@ -17,9 +17,12 @@ endif ifndef TAO_IDL TAO_IDL = $(TAO_ROOT)/TAO_IDL/tao_idl + TAO_IDL_DEP = $(TAO_IDL)$(EXEEXT) +else +ifndef TAO_IDL_DEP + TAO_IDL_DEP = $(TAO_IDL) +endif endif - -TAO_IDL_DEP = $(TAO_IDL)$(EXEEXT) ifeq (,$(findstring -L$(TAO_ROOT)/tao,$(LDFLAGS))) LDFLAGS += -L$(TAO_ROOT)/tao |