Skip to content

Commit

Permalink
add target for android by Emmanuel Maillard
Browse files Browse the repository at this point in the history
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@36365 72102866-910b-0410-8b05-ffd578937521
  • Loading branch information
rfm committed Mar 16, 2013
1 parent cfee9de commit bc4ff74
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 1 deletion.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2012-03-16 Emmanuel Maillard <[email protected]>

* target.make: Add target for android

2012-03-08 Jean-Charles BERTIN <[email protected]>

* TestFramework/gnustep-tests.in: Fix typo
Expand Down
57 changes: 56 additions & 1 deletion target.make
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,11 @@ TARGET_SYSTEM_LIBS = $(CONFIG_SYSTEM_LIBS) -lm
# All code we build needs to be thread-safe nowadays
INTERNAL_CFLAGS = -pthread
INTERNAL_OBJCFLAGS = -pthread
INTERNAL_LDFLAGS = -pthread
ifeq ($(findstring android, $(GNUSTEP_TARGET_OS)), android)
INTERNAL_LDFLAGS =
else
INTERNAL_LDFLAGS = -pthread
endif

ifneq ("$(objc_threaded)","")
AUXILIARY_OBJC_LIBS += $(objc_threaded)
Expand Down Expand Up @@ -1171,3 +1175,54 @@ endif
# end QNX Neutrino ELF
#
####################################################

####################################################
#
# Linux Android
#
ifeq ($(findstring android, $(GNUSTEP_TARGET_OS)), android)
HAVE_SHARED_LIBS = yes
SHARED_LIB_LINK_CMD = \
$(LD) $(SHARED_LD_PREFLAGS) -shared -Wl,-soname,$(LIBRARY_FILE) \
$(ALL_LDFLAGS) -o $(LIB_LINK_OBJ_DIR)/$(LIB_LINK_VERSION_FILE) $^ \
$(INTERNAL_LIBRARIES_DEPEND_UPON) \
$(SHARED_LD_POSTFLAGS) \
&& (cd $(LIB_LINK_OBJ_DIR); \
$(RM_LN_S) $(LIB_LINK_FILE); \
if [ "$(LIB_LINK_SONAME_FILE)" != "$(LIB_LINK_VERSION_FILE)" ]; then\
$(RM_LN_S) $(LIB_LINK_SONAME_FILE);\
$(LN_S) $(LIB_LINK_VERSION_FILE) $(LIB_LINK_SONAME_FILE); \
fi; \
$(LN_S) $(LIB_LINK_SONAME_FILE) $(LIB_LINK_FILE); \
)
AFTER_INSTALL_SHARED_LIB_CMD = \
(cd $(LIB_LINK_INSTALL_DIR); \
$(RM_LN_S) $(LIB_LINK_FILE); \
if [ "$(LIB_LINK_SONAME_FILE)" != "$(LIB_LINK_VERSION_FILE)" ]; then\
$(RM_LN_S) $(LIB_LINK_SONAME_FILE);\
$(LN_S) $(LIB_LINK_VERSION_FILE) $(LIB_LINK_SONAME_FILE); \
fi; \
$(LN_S) $(LIB_LINK_SONAME_FILE) $(LIB_LINK_FILE); \
)
AFTER_INSTALL_SHARED_LIB_CHOWN = \
(cd $(LIB_LINK_INSTALL_DIR); \
chown $(CHOWN_TO) $(LIB_LINK_SONAME_FILE); \
chown $(CHOWN_TO) $(LIB_LINK_FILE))

OBJ_MERGE_CMD = \
$(LD) -nostdlib $(OBJ_MERGE_CMD_FLAG) $(ALL_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;

SHARED_CFLAGS += -fPIC
SHARED_LIBEXT = .so

HAVE_BUNDLES = yes
BUNDLE_LD = $(LD)
BUNDLE_LDFLAGS += -shared
ADDITIONAL_LDFLAGS += -rdynamic
STATIC_LDFLAGS += -static
endif
#
# end Linux Android
#
####################################################

0 comments on commit bc4ff74

Please sign in to comment.