Skip to content

C
core
Kaydet (Commit) 1c2285bb authored tarafından David Tardon's avatar David Tardon
Dosyalara gözat
Seçenekler

another attempt to fix android ARM build 

Change-Id: I36488341d84cb2db05ba564dafa65add79eff9da
üst 8e16b532
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
bridges/CustomTarget_gcc3_linux_arm.mk
Dosyayı görüntüle @ 1c2285bb
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
$(eval $(call gb_CustomTarget_CustomTarget,bridges/source/cpp_uno/gcc3_linux_arm)) $(eval $(call gb_CustomTarget_CustomTarget,bridges/source/cpp_uno/gcc3_linux_arm))
$(call gb_CustomTarget_get_target,bridges/source/cpp_uno/gcc3_linux_arm) : \ $(call gb_CustomTarget_get_target,bridges/source/cpp_uno/gcc3_linux_arm) : \
$(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.o \
$(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist
$(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.o : \ $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.o : \
...@@ -19,7 +18,8 @@ $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhel ...@@ -19,7 +18,8 @@ $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhel
$(gb_CXX) -c -o $@ $< -fPIC $(gb_CXX) -c -o $@ $< -fPIC
$(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist : \ $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist : \
$(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.o \
| $(dir $(call gb_CustomTarget_get_target,bridges/source/cpp_uno/gcc3_linux_arm)).dir | $(dir $(call gb_CustomTarget_get_target,bridges/source/cpp_uno/gcc3_linux_arm)).dir
echo $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.o > $@ echo $< > $@
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
bridges/Library_gcc3_linux_arm.mk
Dosyayı görüntüle @ 1c2285bb
...@@ -14,10 +14,6 @@ bridges_SELECTED_BRIDGE := gcc3_linux_arm ...@@ -14,10 +14,6 @@ bridges_SELECTED_BRIDGE := gcc3_linux_arm
$(eval $(call gb_Library_Library,gcc3_uno)) $(eval $(call gb_Library_Library,gcc3_uno))
$(eval $(call gb_Library_use_custom_headers,gcc3_uno,\
bridges/source/cpp_uno/gcc3_linux_arm \
))
$(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\ $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
udkapi \ udkapi \
)) ))
...@@ -67,6 +63,8 @@ $(eval $(call gb_Library_add_cxxobjects,gcc3_uno,\ ...@@ -67,6 +63,8 @@ $(eval $(call gb_Library_add_cxxobjects,gcc3_uno,\
)) ))
# HACK # HACK
$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,gcc3_uno)) : \
$(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist
$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,gcc3_uno)) : \ $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,gcc3_uno)) : \
EXTRAOBJECTLISTS += $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist EXTRAOBJECTLISTS += $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment