StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add LOCAL_NO_PIC to disable position-independent code"

Browse Source
This commit is contained in:
Alexey Polyudov
2016-08-02 22:03:19 +00:00
committed by Gerrit Code Review
parent b51df6d171 cbb038c8e8
commit ce5900a6e0
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/binary.mk
View File

@@ -220,6 +220,7 @@ endif
# MinGW spits out warnings about -fPIC even for -fpie?!) being ignored because # MinGW spits out warnings about -fPIC even for -fpie?!) being ignored because
# all code is position independent, and then those warnings get promoted to # all code is position independent, and then those warnings get promoted to
# errors. # errors.
ifneq ($(LOCAL_NO_PIC),true)
ifneq ($($(my_prefix)OS),windows) ifneq ($($(my_prefix)OS),windows)
ifneq ($(filter EXECUTABLES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),) ifneq ($(filter EXECUTABLES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),)
my_cflags += -fpie my_cflags += -fpie
@@ -227,6 +228,7 @@ else
my_cflags += -fPIC my_cflags += -fPIC
endif endif
endif endif
endif
ifdef LOCAL_IS_HOST_MODULE ifdef LOCAL_IS_HOST_MODULE
my_src_files += $(LOCAL_SRC_FILES_$($(my_prefix)OS)) $(LOCAL_SRC_FILES_$($(my_prefix)OS)_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) my_src_files += $(LOCAL_SRC_FILES_$($(my_prefix)OS)) $(LOCAL_SRC_FILES_$($(my_prefix)OS)_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH))

1
core/clear_vars.mk
View File

@@ -143,6 +143,7 @@ LOCAL_PROTOC_FLAGS:=
LOCAL_PROTO_JAVA_OUTPUT_PARAMS:= LOCAL_PROTO_JAVA_OUTPUT_PARAMS:=
LOCAL_NO_CRT:= LOCAL_NO_CRT:=
LOCAL_NO_LIBGCC:= LOCAL_NO_LIBGCC:=
LOCAL_NO_PIC:=
LOCAL_PROPRIETARY_MODULE:= LOCAL_PROPRIETARY_MODULE:=
LOCAL_OEM_MODULE:= LOCAL_OEM_MODULE:=
LOCAL_ODM_MODULE:= LOCAL_ODM_MODULE:=