gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed bug that was preventing anything from compiling. Apologies.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@28156 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2009-03-30 23:05:16 +00:00
parent 34aba0d7bf
commit 05b1752afa
3 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,8 @@
2009-03-30 Nicola Pero <nicola.pero@meta-innovation.com>
* config.make.in (OBJC_LIB_FLAG): Set OBJC_LIB_FLAG here.
* library-combo.make: Do not set it here.
2009-03-30 Nicola Pero <nicola.pero@meta-innovation.com>
* configure.ac, library-combo.make: Fixed to automatically use
@ -154,7 +159,7 @@
systems the correct name for GNU make is used in the help. For
example, on OpenBSD it should be 'gmake', not 'make'. Issue
reported by Sebastian Reitenbach <buzzdee@web.de>.
2009-02-02 Nicola Pero <nicola.pero@meta-innovation.com>
* Documentation/releasenotes.texi: Updated.

10
config.make.in
View file

@ -39,6 +39,16 @@ CPP = @CPP@
CXX = @CXX@
CCFLAGS = @CXXFLAGS@
ifeq ($(OBJC_RUNTIME_LIB), gnugc)
ifeq ($(OBJC_LIB_FLAG),)
OBJC_LIB_FLAG = -lobjc_gc
endif
else
ifeq ($(OBJC_LIB_FLAG),)
OBJC_LIB_FLAG = -lobjc
endif
endif
EXEEXT = @EXEEXT@
OEXT = .@OBJEXT@
LIBEXT = .a

13
library-combo.make
View file

@ -91,12 +91,10 @@ OBJC_LIBS =
#
# Set the appropriate ObjC runtime library and other information
#
# PS: OBJC_LIB_FLAG is set by config.make.
ifeq ($(OBJC_RUNTIME_LIB), gnu)
OBJC_LDFLAGS =
OBJC_LIB_DIR =
ifeq ($(OBJC_LIB_FLAG),)
OBJC_LIB_FLAG = -lobjc
endif
OBJC_LIBS = $(OBJC_LIB_FLAG)
RUNTIME_FLAG = -fgnu-runtime
RUNTIME_DEFINE = -DGNU_RUNTIME=1
@ -105,9 +103,6 @@ endif
ifeq ($(OBJC_RUNTIME_LIB), gnugc)
OBJC_LDFLAGS =
OBJC_LIB_DIR =
ifeq ($(OBJC_LIB_FLAG),)
OBJC_LIB_FLAG = -lobjc_gc
endif
OBJC_LIBS = $(OBJC_LIB_FLAG) -ldl -lgc
RUNTIME_FLAG = -fgnu-runtime
RUNTIME_DEFINE = -DGNU_RUNTIME=1 -DGS_WITH_GC=1
@ -120,9 +115,6 @@ ifeq ($(OBJC_RUNTIME_LIB), nx)
RUNTIME_FLAG = -fnext-runtime
RUNTIME_DEFINE = -DNeXT_RUNTIME=1
ifeq ($(FOUNDATION_LIB), gnu)
ifeq ($(OBJC_LIB_FLAG),)
OBJC_LIB_FLAG = -lobjc
endif
OBJC_LIBS = $(OBJC_LIB_FLAG)
endif
endif
@ -135,9 +127,6 @@ ifeq ($(OBJC_RUNTIME_LIB), apple)
RUNTIME_FLAG = -fnext-runtime
RUNTIME_DEFINE = -DNeXT_RUNTIME=1
ifeq ($(FOUNDATION_LIB), gnu)
ifeq ($(OBJC_LIB_FLAG),)
OBJC_LIB_FLAG = -lobjc
endif
OBJC_LIBS = $(OBJC_LIB_FLAG)
endif
endif