From 3fe3248c36883795775d575a00cf6701cd88011e Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 18 May 2016 16:18:13 -0700 Subject: [PATCH] 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 --- core/combo/HOST_CROSS_windows-x86.mk | 2 +- core/combo/HOST_CROSS_windows-x86_64.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/combo/HOST_CROSS_windows-x86.mk b/core/combo/HOST_CROSS_windows-x86.mk index fd1db6fb2..19ff7a328 100644 --- a/core/combo/HOST_CROSS_windows-x86.mk +++ b/core/combo/HOST_CROSS_windows-x86.mk @@ -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. diff --git a/core/combo/HOST_CROSS_windows-x86_64.mk b/core/combo/HOST_CROSS_windows-x86_64.mk index aee45827c..5302c8365 100644 --- a/core/combo/HOST_CROSS_windows-x86_64.mk +++ b/core/combo/HOST_CROSS_windows-x86_64.mk @@ -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.