Unify -fPIC handling, improve windows building

global.mk

@@ -46,5 +46,6 @@ endif
 	$(CC) -c $(CFLAGS) -o $@ $<
 
 -include $(TOP)/config-user.mk
+-include $(TOP)/mk/platform.mk
 -include $(TOP)/mk/${COMPILER}.mk
 endif

libr/Makefile

@@ -1,6 +1,7 @@
 include ../global.mk
 include config.mk
 include ../config-user.mk
+include ../mk/platform.mk
 include ../mk/${COMPILER}.mk
 
 DESTDIR:=$(call rmbdlslash,$(DESTDIR))

mk/clang.mk

@@ -15,18 +15,6 @@ CFLAGS_OPT2=-O2
 CFLAGS_OPT3=-O3
 CFLAGS_DEBUG=-g
 
-ifeq ($(OSTYPE),auto)
-OSTYPE=$(shell uname | tr 'A-Z' 'a-z')
-endif
-ifneq (,$(findstring cygwin,${OSTYPE}))
-PIC_CFLAGS=
-else
-ifneq (,$(findstring mingw32,${OSTYPE}))
-PIC_CFLAGS=
-else
-PIC_CFLAGS=-fPIC
-endif
-endif
 ifeq ($(OSTYPE),darwin)
 ARCH=$(shell uname -m)
 #CFLAGS+=-arch ${ARCH}

mk/gcc.mk

@@ -15,26 +15,6 @@ CFLAGS_OPT2=-O2
 CFLAGS_OPT3=-O3
 CFLAGS_DEBUG=-g
 
-ifeq ($(OSTYPE),auto)
-OSTYPE=$(shell uname | tr 'A-Z' 'a-z')
-endif
-ifneq (,$(findstring cygwin,${OSTYPE}))
-PIC_CFLAGS=
-else
-ifneq (,$(findstring mingw32,${OSTYPE}))
-PIC_CFLAGS=
-else
-ifneq (,$(findstring mingw64,${OSTYPE}))
-PIC_CFLAGS=
-else
-ifneq (,$(findstring msys,${OSTYPE}))
-PIC_CFLAGS=
-else
-PIC_CFLAGS=-fPIC
-endif
-endif
-endif
-endif
 ifeq ($(OSTYPE),darwin)
 ARCH=$(shell uname -m)
 #CFLAGS+=-arch ${ARCH}

mk/platform.mk

@@ -0,0 +1,21 @@
+ifeq ($(OSTYPE),auto)
+OSTYPE=$(shell uname | tr 'A-Z' 'a-z')
+endif
+ifneq (,$(findstring cygwin,${OSTYPE}))
+PIC_CFLAGS=
+else
+ifneq (,$(findstring mingw32,${OSTYPE}))
+PIC_CFLAGS=
+else
+ifneq (,$(findstring mingw64,${OSTYPE}))
+PIC_CFLAGS=
+else
+ifneq (,$(findstring msys,${OSTYPE}))
+PIC_CFLAGS=
+else
+PIC_CFLAGS=-fPIC
+endif
+endif
+endif
+endif
+

mk/tcc.mk

@@ -12,18 +12,6 @@ CFLAGS_OPT1=-O1
 CFLAGS_OPT2=-O2
 CFLAGS_OPT3=-O3
 
-ifeq ($(OSTYPE),auto)
-OSTYPE=$(shell uname | tr 'A-Z' 'a-z')
-endif
-ifneq (,$(findstring cygwin,$(OSTYPE)))
-PIC_CFLAGS=
-else
-ifneq (,$(findstring mingw32,${OSTYPE}))
-PIC_CFLAGS=
-else
-PIC_CFLAGS=-fPIC
-endif
-endif
 ifeq ($(OSTYPE),darwin)
 LDFLAGS_LIB=-dynamiclib
 LDFLAGS_SONAME=-Wl,-install_name,

shlr/Makefile

@@ -2,6 +2,7 @@ include ../global.mk
 include ../config-user.mk
 # for EXT_EXE
 include ../libr/config.mk
+include ../mk/platform.mk
 _INCLUDE_MK_GCC_=
 include ../mk/${COMPILER}.mk
 

shlr/grub/Makefile

@@ -2,6 +2,7 @@ NAME=grubfs
 
 include ../../config-user.mk
 include ../../global.mk
+include ../../mk/platform.mk
 NAME=grubfs
 _INCLUDE_MK_GCC_=
 include ../../libr/config.mk
@@ -64,13 +65,20 @@ CFLAGS+=-Iinclude
 CFLAGS+=-I../../libr/include -DGRUB_TARGET_NO_MODULES
 CFLAGS+=-g
 
-ifeq (,$(findstring cygwin,${OSTYPE}))
+ifneq (,$(findstring cygwin,${OSTYPE}))
-ifeq (,$(findstring mingw32,${OSTYPE}))
+CFLAGS+=-D__CYGWIN__=1
-CFLAGS+=-fPIC
 else
+ifneq (,$(findstring mingw32,${OSTYPE}))
 CFLAGS+=-DMINGW32=1
+else
+ifneq (,$(findstring mingw64,${OSTYPE})$(findstring msys,${OSTYPE}))
+LFDLAGS_SHARE?=-shared
+else
+CFLAGS+=${PIC_CFLAGS}
 endif
 endif
+endif
+
 # This fixes a silly GNU gcc build problem in OSX - BLAME! :D
 ifeq (${OSTYPE},darwin)
 CFLAGS+=-DAPPLE_CC

shlr/wind/Makefile

@@ -1,4 +1,5 @@
 include ../../config-user.mk
+include ../../mk/platform.mk
 include ../../mk/${COMPILER}.mk
 
 ifneq (,$(findstring cygwin,${OSTYPE}))
@@ -15,7 +16,12 @@ SOVER=${EXT_SO}
 LDFLAGS+=-shared
 LDFLAGS_SHARED?=-shared
 else
-CFLAGS+=-fPIC
+ifneq (,$(findstring mingw64,${OSTYPE})$(findstring msys,${OSTYPE}))
+LDFLAGS+=-shared
+LFDLAGS_SHARE?=-shared
+else
+CFLAGS+=${PIC_CFLAGS}
+endif
 endif
 endif
 

shlr/zip/Makefile

@@ -3,6 +3,7 @@ LIBAR=librz.a
 
 include ../../config-user.mk
 include ../../libr/config.mk
+include ../../mk/platform.mk
 include ../../mk/${COMPILER}.mk
 
 ifeq ($(USE_LIB_ZIP),1)

shlr/zip/zlib/Makefile

@@ -1,7 +1,10 @@
 include ../../../config-user.mk
 include ../../../libr/config.mk
+include ../../../mk/platform.mk
 include ../../../mk/${COMPILER}.mk
 
+CFLAGS+=${PIC_CFLAGS}
+
 ifneq (,$(findstring cygwin,${OSTYPE}))
 CFLAGS+=-D__CYGWIN__=1
 EXT_SO=dll
@@ -16,15 +19,15 @@ SOVER=${EXT_SO}
 LDFLAGS+=-shared
 LDFLAGS_SHARED?=-shared
 else
-CFLAGS+=-fPIC
+LDFLAGS_SHARED?=-shared
-LDFLAGS_SHARED?=-fPIC -shared
+LDFLAGS_SHARED?=${PIC_CFLAGS} -shared
 endif
 endif
 ifeq (${OSTYPE},windows)
 EXT_SO=dll
 SOVER=${EXT_SO}
 LDFLAGS+=-shared
-LDFLAGS_SHARED?=-fPIC -shared
+LDFLAGS_SHARED?=${PIC_CFLAGS} -shared
 else
 ifeq (${OSTYPE},darwin)
 EXT_SO=dylib