Fossil SCM
Cleaned up the platform fragments. Corrected two compiler settings.
Commit
81e4477e90cf22231305ad62eed9afadea901eb2
Parent
cd98f05dbe7af8e…
4 files changed
+1
-1
+1
-1
+4
-1
+4
+1
-1
| --- make/clang-fragment.mk | ||
| +++ make/clang-fragment.mk | ||
| @@ -46,8 +46,8 @@ | ||
| 46 | 46 | endif |
| 47 | 47 | ifdef ENABLE_NSL |
| 48 | 48 | LIB += -lnsl |
| 49 | 49 | endif |
| 50 | 50 | ifdef PLATFORM_SPECIFIC_LIB |
| 51 | - TCC += $(PLATFORM_SPECIFIC_LIB) | |
| 51 | + LIB += $(PLATFORM_SPECIFIC_LIB) | |
| 52 | 52 | endif |
| 53 | 53 | |
| 54 | 54 |
| --- make/clang-fragment.mk | |
| +++ make/clang-fragment.mk | |
| @@ -46,8 +46,8 @@ | |
| 46 | endif |
| 47 | ifdef ENABLE_NSL |
| 48 | LIB += -lnsl |
| 49 | endif |
| 50 | ifdef PLATFORM_SPECIFIC_LIB |
| 51 | TCC += $(PLATFORM_SPECIFIC_LIB) |
| 52 | endif |
| 53 | |
| 54 |
| --- make/clang-fragment.mk | |
| +++ make/clang-fragment.mk | |
| @@ -46,8 +46,8 @@ | |
| 46 | endif |
| 47 | ifdef ENABLE_NSL |
| 48 | LIB += -lnsl |
| 49 | endif |
| 50 | ifdef PLATFORM_SPECIFIC_LIB |
| 51 | LIB += $(PLATFORM_SPECIFIC_LIB) |
| 52 | endif |
| 53 | |
| 54 |
+1
-1
| --- make/gcc-fragment.mk | ||
| +++ make/gcc-fragment.mk | ||
| @@ -46,8 +46,8 @@ | ||
| 46 | 46 | endif |
| 47 | 47 | ifdef ENABLE_NSL |
| 48 | 48 | LIB += -lnsl |
| 49 | 49 | endif |
| 50 | 50 | ifdef PLATFORM_SPECIFIC_LIB |
| 51 | - TCC += $(PLATFORM_SPECIFIC_LIB) | |
| 51 | + LIB += $(PLATFORM_SPECIFIC_LIB) | |
| 52 | 52 | endif |
| 53 | 53 | |
| 54 | 54 |
| --- make/gcc-fragment.mk | |
| +++ make/gcc-fragment.mk | |
| @@ -46,8 +46,8 @@ | |
| 46 | endif |
| 47 | ifdef ENABLE_NSL |
| 48 | LIB += -lnsl |
| 49 | endif |
| 50 | ifdef PLATFORM_SPECIFIC_LIB |
| 51 | TCC += $(PLATFORM_SPECIFIC_LIB) |
| 52 | endif |
| 53 | |
| 54 |
| --- make/gcc-fragment.mk | |
| +++ make/gcc-fragment.mk | |
| @@ -46,8 +46,8 @@ | |
| 46 | endif |
| 47 | ifdef ENABLE_NSL |
| 48 | LIB += -lnsl |
| 49 | endif |
| 50 | ifdef PLATFORM_SPECIFIC_LIB |
| 51 | LIB += $(PLATFORM_SPECIFIC_LIB) |
| 52 | endif |
| 53 | |
| 54 |
+4
-1
| --- make/linux-fragment.mk | ||
| +++ make/linux-fragment.mk | ||
| @@ -9,8 +9,11 @@ | ||
| 9 | 9 | |
| 10 | 10 | #### The following variable definitions decide which features are turned on or |
| 11 | 11 | # of when building Fossil. Comment out the features which are not needed by |
| 12 | 12 | # this platform. |
| 13 | 13 | # |
| 14 | +#ENABLE_STATIC = 1 # we want a static build | |
| 14 | 15 | ENABLE_SSL = 1 # we are using SSL |
| 15 | -ENABLE_I18N = 1 # we are using i18n features | |
| 16 | +#ENABLE_SOCKET = 1 # we are using libsocket (OpenSolaris and Solaris) | |
| 17 | +#ENABLE_NSL = 1 # we are using libnsl library (Solaris) | |
| 18 | +ENABLE_I18N = 1 # we are using i18n settings | |
| 16 | 19 | |
| 17 | 20 |
| --- make/linux-fragment.mk | |
| +++ make/linux-fragment.mk | |
| @@ -9,8 +9,11 @@ | |
| 9 | |
| 10 | #### The following variable definitions decide which features are turned on or |
| 11 | # of when building Fossil. Comment out the features which are not needed by |
| 12 | # this platform. |
| 13 | # |
| 14 | ENABLE_SSL = 1 # we are using SSL |
| 15 | ENABLE_I18N = 1 # we are using i18n features |
| 16 | |
| 17 |
| --- make/linux-fragment.mk | |
| +++ make/linux-fragment.mk | |
| @@ -9,8 +9,11 @@ | |
| 9 | |
| 10 | #### The following variable definitions decide which features are turned on or |
| 11 | # of when building Fossil. Comment out the features which are not needed by |
| 12 | # this platform. |
| 13 | # |
| 14 | #ENABLE_STATIC = 1 # we want a static build |
| 15 | ENABLE_SSL = 1 # we are using SSL |
| 16 | #ENABLE_SOCKET = 1 # we are using libsocket (OpenSolaris and Solaris) |
| 17 | #ENABLE_NSL = 1 # we are using libnsl library (Solaris) |
| 18 | ENABLE_I18N = 1 # we are using i18n settings |
| 19 | |
| 20 |
| --- make/mingw32-fragment.mk | ||
| +++ make/mingw32-fragment.mk | ||
| @@ -13,10 +13,14 @@ | ||
| 13 | 13 | #### The following variable definitions decide which features are turned on or |
| 14 | 14 | # of when building Fossil. Comment out the features which are not needed by |
| 15 | 15 | # this platform. |
| 16 | 16 | # |
| 17 | 17 | ENABLE_STATIC = 1 # we want a static build |
| 18 | +#ENABLE_SSL = 1 # we are using SSL | |
| 19 | +#ENABLE_SOCKET = 1 # we are using libsocket (OpenSolaris and Solaris) | |
| 20 | +#ENABLE_NSL = 1 # we are using libnsl library (Solaris) | |
| 21 | +#ENABLE_I18N = 1 # we are using i18n settings | |
| 18 | 22 | |
| 19 | 23 | #### The following features must be added to the GCC and LD builds respectively. |
| 20 | 24 | # |
| 21 | 25 | ifndef MING32_GCC |
| 22 | 26 | PLATFORM_SPECIFIC_GCC = -L/mingw/lib -I/mingw/include |
| 23 | 27 |
| --- make/mingw32-fragment.mk | |
| +++ make/mingw32-fragment.mk | |
| @@ -13,10 +13,14 @@ | |
| 13 | #### The following variable definitions decide which features are turned on or |
| 14 | # of when building Fossil. Comment out the features which are not needed by |
| 15 | # this platform. |
| 16 | # |
| 17 | ENABLE_STATIC = 1 # we want a static build |
| 18 | |
| 19 | #### The following features must be added to the GCC and LD builds respectively. |
| 20 | # |
| 21 | ifndef MING32_GCC |
| 22 | PLATFORM_SPECIFIC_GCC = -L/mingw/lib -I/mingw/include |
| 23 |
| --- make/mingw32-fragment.mk | |
| +++ make/mingw32-fragment.mk | |
| @@ -13,10 +13,14 @@ | |
| 13 | #### The following variable definitions decide which features are turned on or |
| 14 | # of when building Fossil. Comment out the features which are not needed by |
| 15 | # this platform. |
| 16 | # |
| 17 | ENABLE_STATIC = 1 # we want a static build |
| 18 | #ENABLE_SSL = 1 # we are using SSL |
| 19 | #ENABLE_SOCKET = 1 # we are using libsocket (OpenSolaris and Solaris) |
| 20 | #ENABLE_NSL = 1 # we are using libnsl library (Solaris) |
| 21 | #ENABLE_I18N = 1 # we are using i18n settings |
| 22 | |
| 23 | #### The following features must be added to the GCC and LD builds respectively. |
| 24 | # |
| 25 | ifndef MING32_GCC |
| 26 | PLATFORM_SPECIFIC_GCC = -L/mingw/lib -I/mingw/include |
| 27 |