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

* Add runtime flags everywhere for Mac OS/gcc dual runtimes

Browse source 
* rules.make (CC_LDFLAGS): New variable for extra ld flags
* target.make (darwin/SHARED_LD_PREFLAGS): Use it.
* Instance/application.make (APP_FILE),
Instance/gswapp.make (GSWAPP_FILE), Instance/objc.make,
Instance/service.make (SERVICE_FILE), Instance/tool.make: Idem.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@21737 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2005-09-22 22:07:57 +00:00
parent e07739686a
commit 5f5e85cb40
8 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2005-09-22 Adam Fedor <fedor@gnu.org>
* Add runtime flags everywhere for Mac OS/gcc dual runtimes
* rules.make (CC_LDFLAGS): New variable for extra ld flags
* target.make (darwin/SHARED_LD_PREFLAGS): Use it.
* Instance/application.make (APP_FILE),
Instance/gswapp.make (GSWAPP_FILE), Instance/objc.make,
Instance/service.make (SERVICE_FILE), Instance/tool.make: Idem.
2005-09-18 Adam Fedor <fedor@gnu.org>
* Version 1.11.1

4
Instance/application.make
View file

@ -115,8 +115,8 @@ ifeq ($(BUILD_DLL), yes)
endif
$(APP_FILE): $(OBJ_FILES_TO_LINK)
$(ECHO_LINKING)$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ $(OBJ_FILES_TO_LINK)\
$(ALL_GUI_LIBS)$(END_ECHO)
$(ECHO_LINKING)$(LD) $(ALL_LDFLAGS) $(CC_LDFLAGS) -o $(LDOUT)$@ \
$(OBJ_FILES_TO_LINK) $(ALL_GUI_LIBS)$(END_ECHO)
ifneq ($(FOUNDATION_LIB), apple)
$(ECHO_NOTHING)$(TRANSFORM_PATHS_SCRIPT) $(subst -L,,$(ALL_LIB_DIRS)) \
>$(APP_DIR)/$(GNUSTEP_TARGET_LDIR)/library_paths.openapp$(END_ECHO)

4
Instance/gswapp.make
View file

@ -117,8 +117,8 @@ GSWAPP_FILE = $(GNUSTEP_BUILD_DIR)/$(GSWAPP_FILE_NAME)
#
$(GSWAPP_FILE): $(OBJ_FILES_TO_LINK)
$(ECHO_LINKING)$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ $(OBJ_FILES_TO_LINK)\
$(ALL_GSW_LIBS)$(END_ECHO)
$(ECHO_LINKING)$(LD) $(ALL_LDFLAGS) $(CC_LDFLAGS) -o $(LDOUT)$@ \
$(OBJ_FILES_TO_LINK) $(ALL_GSW_LIBS)$(END_ECHO)
ifneq ($(FOUNDATION_LIB), apple)
$(ECHO_NOTHING)$(TRANSFORM_PATHS_SCRIPT) $(subst -L,,$(ALL_LIB_DIRS)) \
>$(GSWAPP_DIR)/$(GNUSTEP_TARGET_LDIR)/library_paths.openapp$(END_ECHO)

4
Instance/objc.make
View file

@ -58,8 +58,8 @@ internal-objc_program-all_:: \
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT)
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT): $(OBJ_FILES_TO_LINK)
$(ECHO_LINKING)$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ $(OBJ_FILES_TO_LINK)\
$(ALL_OBJC_LIBS)$(END_ECHO)
$(ECHO_LINKING)$(LD) $(ALL_LDFLAGS) $(CC_LDFLAGS) -o $(LDOUT)$@ \
$(OBJ_FILES_TO_LINK) $(ALL_OBJC_LIBS)$(END_ECHO)
internal-objc_program-install_:: $(OBJC_PROGRAM_INSTALL_DIR)/$(GNUSTEP_TARGET_LDIR)
$(ECHO_INSTALLING)$(INSTALL_PROGRAM) -m 0755 \

4
Instance/service.make
View file

@ -82,8 +82,8 @@ internal-service-all_:: $(GNUSTEP_OBJ_DIR) \
shared-instance-bundle-all
$(SERVICE_FILE): $(OBJ_FILES_TO_LINK)
$(ECHO_LINKING)$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ $(OBJ_FILES_TO_LINK)\
$(ALL_SERVICE_LIBS)$(END_ECHO)
$(ECHO_LINKING)$(LD) $(ALL_LDFLAGS) $(CC_LDFLAGS) -o $(LDOUT)$@ \
$(OBJ_FILES_TO_LINK) $(ALL_SERVICE_LIBS)$(END_ECHO)
$(SERVICE_DIR)/$(GNUSTEP_TARGET_LDIR):
$(ECHO_CREATING)$(MKDIRS) $(SERVICE_DIR)/$(GNUSTEP_TARGET_LDIR)$(END_ECHO)

2
Instance/tool.make
View file

@ -68,7 +68,7 @@ internal-tool-all_:: $(GNUSTEP_OBJ_DIR) \
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT)
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT): $(OBJ_FILES_TO_LINK)
$(ECHO_LINKING)$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ \
$(ECHO_LINKING)$(LD) $(ALL_LDFLAGS) $(CC_LDFLAGS) -o $(LDOUT)$@ \
$(OBJ_FILES_TO_LINK) \
$(ALL_TOOL_LIBS)$(END_ECHO)

3
rules.make
View file

@ -264,6 +264,9 @@ else
endif
ALL_LDFLAGS += $(ADDITIONAL_LDFLAGS) $(AUXILIARY_LDFLAGS) $(GUI_LDFLAGS) \
$(BACKEND_LDFLAGS) $(SYSTEM_LDFLAGS) $(INTERNAL_LDFLAGS)
# In some cases, ld is used for linking instead of $(CC), so we can't use
# this in ALL_LDFLAGS
CC_LDFLAGS = $(RUNTIME_FLAG)
ALL_LIB_DIRS = $(ADDITIONAL_FRAMEWORK_DIRS) $(AUXILIARY_FRAMEWORK_DIRS) \
$(ADDITIONAL_LIB_DIRS) $(AUXILIARY_LIB_DIRS) \

2
target.make
View file

@ -304,7 +304,7 @@ ifeq ($(CC_BUNDLE), no)
INTERNAL_LDFLAGS += -flat_namespace -undefined warning
SHARED_LD_PREFLAGS += -Wl,-noall_load -read_only_relocs warning $(RUNTIME_FLAG)
SHARED_LD_PREFLAGS += -Wl,-noall_load -read_only_relocs warning $(CC_LDFLAGS)
# Useful flag: -Wl,-single_module. This flag only
# works starting with 10.3. libs w/ffcall don't link on darwin/ix86 without it.
ifeq ($(findstring darwin7, $(GNUSTEP_TARGET_OS)), darwin7)