diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-04-14 18:31:01 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-04-14 18:31:01 +0000 |
| commit | 6dc2ef49cff6e0f6d6bd19c152e64d2e042d4ed0 (patch) | |
| tree | e8ab713351b814115bd54d18e523ab968de5fddf /include/makeinclude | |
| parent | 4e93290031adb7c07cb00ab2c7d24ac29d2963a2 (diff) | |
| download | ATCD-6dc2ef49cff6e0f6d6bd19c152e64d2e042d4ed0.tar.gz | |
ChangeLogTag: Mon Apr 14 20:26:12 2002 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'include/makeinclude')
| -rw-r--r-- | include/makeinclude/platform_linux_borland.GNU | 7 | ||||
| -rw-r--r-- | include/makeinclude/rules.lib.GNU | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/include/makeinclude/platform_linux_borland.GNU b/include/makeinclude/platform_linux_borland.GNU index a350b2f8435..c6272eec00f 100644 --- a/include/makeinclude/platform_linux_borland.GNU +++ b/include/makeinclude/platform_linux_borland.GNU @@ -100,14 +100,13 @@ CFLAGS = $(WARNINGS_CFLAGS) -q -VP -Vx -a8 -b- -k $(DCFLAGS) \ CPPFLAGS += #$(CFLAGS) CCFLAGS += $(CFLAGS) BORLDFLAGS = -c -L$(LIBPATH):$(ACELIBPATH) -x -Gn -v -BORINITOBJ = borinitso.o borinit.o crt1.o +BORINITOBJ = borinitso.o borinit.o crt1.o BORSHAREDOBJ += libborcrtl.so libborstl.so libborunwind.so libc.so libm.so libdl.so LIBS += $(BORINITOBJ) $(BORSHAREDOBJ) - + PRELINK= -SOFLAGS= -Tpd +SOFLAGS= -Tpd $(BORLDFLAGS) -SOLINK.cc = $(LD) -Tpd LINK.cc = override LINK.cc.override = $(LD) $(LDFLAGS) $(BORINITOBJ) $(BORSHAREDOBJ) $(BORLDFLAGS) $(POSTLINK) diff --git a/include/makeinclude/rules.lib.GNU b/include/makeinclude/rules.lib.GNU index 346eee4ae36..8057c0189cc 100644 --- a/include/makeinclude/rules.lib.GNU +++ b/include/makeinclude/rules.lib.GNU @@ -119,7 +119,7 @@ ifdef ibmcxx_build fi else ifdef kylix - $(SOLINK.cc) $(LDFLAGS) $(VSHOBJS1), $@,, $(LDFLAGS) $(ACE_SHLIBS) $(LIBS) + $(SOLINK.cc) $(LDFLAGS) $(VSHOBJS1), $@,, $(ACE_SHLIBS) $(LIBS) else ifeq (1,$(ace_lib_prelink)) #### Attempt a link (which will fail), to add template instantiations |