diff options
| author | Andrew Boie <andrew.p.boie@intel.com> | 2013-11-11 16:17:20 -0800 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2013-11-12 10:31:59 -0500 |
| commit | 9712a7e77dc12f7569858b81d620d85301f50ede (patch) | |
| tree | b1a1020bf50918bd2630a87b7e125140bb56cee8 /Cryptlib | |
| parent | 476d376ed08e1431bf7e20bf47ea3fc6c36dd168 (diff) | |
| download | efi-boot-shim-9712a7e77dc12f7569858b81d620d85301f50ede.tar.gz efi-boot-shim-9712a7e77dc12f7569858b81d620d85301f50ede.zip | |
allow 32-bit compilation with 64-bit compiler
Also removed unused LIB_PATH from some Makefiles.
Change-Id: I7d28d18f7531b51b6121a2ffb88bcaedec57c467
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Diffstat (limited to 'Cryptlib')
| -rw-r--r-- | Cryptlib/Makefile | 5 | ||||
| -rw-r--r-- | Cryptlib/OpenSSL/Makefile | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/Cryptlib/Makefile b/Cryptlib/Makefile index a05a4db0..d24e59e7 100644 --- a/Cryptlib/Makefile +++ b/Cryptlib/Makefile @@ -1,7 +1,5 @@ ARCH = $(shell uname -m | sed s,i[3456789]86,ia32,) -LIB_PATH = /usr/lib64 - EFI_INCLUDE = /usr/include/efi EFI_INCLUDES = -nostdinc -IInclude -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol EFI_PATH = /usr/lib64/gnuefi @@ -14,6 +12,9 @@ CFLAGS = -ggdb -O0 -I. -fno-stack-protector -fno-strict-aliasing -fpic -fshort- ifeq ($(ARCH),x86_64) CFLAGS += -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI endif +ifeq ($(ARCH),ia32) + CFLAGS += -m32 +endif LDFLAGS = -nostdlib -znocombreloc TARGET = libcryptlib.a diff --git a/Cryptlib/OpenSSL/Makefile b/Cryptlib/OpenSSL/Makefile index 3d5a87cd..8e2f2a6f 100644 --- a/Cryptlib/OpenSSL/Makefile +++ b/Cryptlib/OpenSSL/Makefile @@ -1,7 +1,5 @@ ARCH = $(shell uname -m | sed s,i[3456789]86,ia32,) -LIB_PATH = /usr/lib64 - EFI_INCLUDE = /usr/include/efi EFI_INCLUDES = -I../Include -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol EFI_PATH = /usr/lib64/gnuefi @@ -15,7 +13,7 @@ ifeq ($(ARCH),x86_64) CFLAGS += -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI -DSIXTY_FOUR_BIT_LONG endif ifeq ($(ARCH),ia32) - CFLAGS += -DTHIRTY_TWO_BIT + CFLAGS += -m32 -DTHIRTY_TWO_BIT endif LDFLAGS = -nostdlib -znocombreloc |