remove -m64 build option
It has been put back by error. Although alone, this does not fix
portability issues, it is one less problem to deal with.
Étienne Mollier
3 years ago
|
0 |
kmc (3.1.1+dfsg-2) UNRELEASED; urgency=medium
|
|
1 |
|
|
2 |
* Remove non-portable -m64 flag put back by error.
|
|
3 |
|
|
4 |
-- Étienne Mollier <etienne.mollier@mailoo.org> Fri, 11 Dec 2020 00:07:16 +0100
|
|
5 |
|
| 0 | 6 |
kmc (3.1.1+dfsg-1) unstable; urgency=medium
|
| 1 | 7 |
|
| 2 | 8 |
* Added myself to Uploaders.
|
| 14 | 14 |
KMC_MAIN_DIR = kmer_counter
|
| 15 | 15 |
@@ -9,6 +9,7 @@
|
| 16 | 16 |
|
| 17 | |
KMC_TOOLS_CXXFLAGS := $(CXXFLAGS) -Wall -O3 -m64
|
|
17 |
KMC_TOOLS_CXXFLAGS := $(CXXFLAGS) -Wall -O3
|
| 18 | 18 |
KMC_TOOLS_LDFLAGS := $(LDFLAGS) -lm -O3 -lpthread -std=c++14 -lz -lbz2
|
| 19 | 19 |
+KMC_LIB_OBJS = $(sort $(wildcard $(KMC_API_DIR)/*.o))
|
| 20 | 20 |
|
| 21 | |
CXXFLAGS += -Wall -O3 -m64
|
|
21 |
CXXFLAGS += -Wall -O3
|
| 22 | 22 |
LDFLAGS += -lm -O3 -lpthread -std=c++11 -lz -lbz2
|
| 23 | 23 |
@@ -97,6 +98,10 @@
|
| 24 | 24 |
-I `python3 -c "import sysconfig;print(sysconfig.get_paths()['include'])"` \
|
| 13 | 13 |
-CC = g++
|
| 14 | 14 |
-CFLAGS = -Wall -O3 -m64 -static -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -std=c++11
|
| 15 | 15 |
-CLINK = -lm -static -O3 -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -std=c++11
|
| 16 | |
+KMC_TOOLS_CXXFLAGS := $(CXXFLAGS) -Wall -O3 -m64
|
|
16 |
+KMC_TOOLS_CXXFLAGS := $(CXXFLAGS) -Wall -O3
|
| 17 | 17 |
+KMC_TOOLS_LDFLAGS := $(LDFLAGS) -lm -O3 -lpthread -std=c++14 -lz -lbz2
|
| 18 | 18 |
|
| 19 | 19 |
-KMC_TOOLS_CFLAGS = -Wall -O3 -m64 -static -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -std=c++14
|
| 20 | 20 |
-KMC_TOOLS_CLINK = -lm -static -O3 -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -std=c++14
|
| 21 | |
+CXXFLAGS += -Wall -O3 -m64
|
|
21 |
+CXXFLAGS += -Wall -O3
|
| 22 | 22 |
+LDFLAGS += -lm -O3 -lpthread -std=c++11 -lz -lbz2
|
| 23 | 23 |
|
| 24 | 24 |
KMC_OBJS = \
|
|
| 64 | 64 |
|
| 65 | 65 |
$(PY_KMC_API_DIR)/%.o: $(KMC_API_DIR)/%.cpp
|
| 66 | 66 |
- $(CC) -c -fPIC -Wall -O3 -m64 -std=c++11 $^ -o $@
|
| 67 | |
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -fPIC -Wall -O3 -m64 -std=c++11 $^ -o $@
|
|
67 |
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -fPIC -Wall -O3 -std=c++11 $^ -o $@
|
| 68 | 68 |
|
| 69 | 69 |
py_kmc_api: $(PY_KMC_API_OBJS) $(PY_KMC_API_OBJS)
|
| 70 | 70 |
-mkdir -p $(KMC_BIN_DIR)
|