Revert "pud: update nmealib 32/64 cross compilation"
authorFerry Huberts <ferry.huberts@pelagic.nl>
Wed, 20 Feb 2013 09:44:49 +0000 (10:44 +0100)
committerFerry Huberts <ferry.huberts@pelagic.nl>
Wed, 20 Feb 2013 09:44:49 +0000 (10:44 +0100)
This reverts commit d19b7f869ca25c559e68e185ce2c8a1e999504de.
It breaks the Android build.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
lib/pud/nmealib/Makefile.inc

index 3d77be3..28d90cf 100644 (file)
@@ -58,24 +58,10 @@ LDFLAGS = -shared -Wl,--warn-common -fPIC
 
 # 32/64 cross compilation
 ifdef M32
-MYARCH=32
-else
-ifdef M64
-MYARCH=64
-else
-ifeq ($(shell uname -m),x86_64)
-MYARCH=64
-else
-MYARCH=32
-endif
+CFLAGS +=      -m32
+LDFLAGS +=     -m32
 endif
-endif
-
-ifeq ($(MYARCH),32)
-CFLAGS += -m32
-LDFLAGS += -m32
-endif
-ifeq ($(MYARCH),64)
-CFLAGS += -m64
-LDFLAGS += -m64
+ifdef M64
+CFLAGS +=      -m64
+LDFLAGS +=     -m64
 endif