Skip to content

Commit

Permalink
Applied tiny patch from Graham to fix building base additions on Apple
Browse files Browse the repository at this point in the history
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@34802 72102866-910b-0410-8b05-ffd578937521
  • Loading branch information
nicola committed Feb 21, 2012
1 parent 56fad74 commit b19592f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2012-02-21 Graham Lee <[email protected]>

* library-combo.make (OBJC_LIBS): Always set from OBJC_LIB_FLAG
when using the 'apple' runtime.

2012-02-17 Adam Fedor <[email protected]>

* Master/nsis.make: Add support for library and framework packages
Expand Down
4 changes: 1 addition & 3 deletions library-combo.make
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,7 @@ endif
ifeq ($(OBJC_RUNTIME_LIB), apple)
RUNTIME_FLAG = -fnext-runtime
RUNTIME_DEFINE = -DNeXT_RUNTIME=1
ifeq ($(FOUNDATION_LIB), gnu)
OBJC_LIBS = $(OBJC_LIB_FLAG)
endif
OBJC_LIBS = $(OBJC_LIB_FLAG)
endif

FND_LDFLAGS =
Expand Down

0 comments on commit b19592f

Please sign in to comment.