Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit caac8033 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Windows: Stop adding to GLOBAL_LD_DIRS" am: e23a4915 am: 84eb1d2c 

am: dcfa9202

* commit 'dcfa9202':
  Windows: Stop adding to GLOBAL_LD_DIRS

Change-Id: Ieeb6f2894a4d7b419d5424193a29927af3974bb8
parents 0af09cfa dcfa9202

core/combo/HOST_CROSS_windows-x86.mk

+1 −1
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ $(combo_var_prefix)GLOBAL_CFLAGS += -Wno-unused-parameter 
$(combo_var_prefix)GLOBAL_CFLAGS += --sysroot prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32

$(combo_var_prefix)GLOBAL_CFLAGS += -m32

$(combo_var_prefix)GLOBAL_LDFLAGS += -m32

$(combo_var_prefix)GLOBAL_LDFLAGS += -Lprebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/lib32

$(combo_var_prefix)C_INCLUDES += prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/include

$(combo_var_prefix)C_INCLUDES += prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/lib/gcc/x86_64-w64-mingw32/4.8.3/include

$(combo_var_prefix)GLOBAL_LD_DIRS += -Lprebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/lib32



# Workaround differences in inttypes.h between host and target.

# See bug 12708004.

core/combo/HOST_CROSS_windows-x86_64.mk

+1 −1
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ $(combo_var_prefix)GLOBAL_CFLAGS += -Wno-unused-parameter 
$(combo_var_prefix)GLOBAL_CFLAGS += --sysroot prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32

$(combo_var_prefix)GLOBAL_CFLAGS += -m64

$(combo_var_prefix)GLOBAL_LDFLAGS += -m64

$(combo_var_prefix)GLOBAL_LDFLAGS += -Lprebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/lib64

$(combo_var_prefix)C_INCLUDES += prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/include

$(combo_var_prefix)C_INCLUDES += prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/lib/gcc/x86_64-w64-mingw32/4.8.3/include

$(combo_var_prefix)GLOBAL_LD_DIRS += -Lprebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/lib64



# Workaround differences in inttypes.h between host and target.

# See bug 12708004.