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

Commit 3fe3248c authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Windows: Stop adding to GLOBAL_LD_DIRS 

Soong does not have the idea of global linking directories, so move the
windows prebuilt library directory to GLOBAL_LDFLAGS instead.

Change-Id: Ie101146f4682cd85924463aa5acaa46869938e6c
parent 6864e379

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.