consider x86 arch

herumi · Jan 16, 2023 · 926d6b7 · 926d6b7
1 parent 611d1cc
commit 926d6b7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -234,7 +234,7 @@ $(MCL_LIB): $(LIB_OBJ)
 	$(AR) $(ARFLAGS) $@ $(LIB_OBJ)
 
 $(MCL_SLIB): $(LIB_OBJ)
-	$(PRE)$(CXX) -o $@ $(LIB_OBJ) -shared $(LDFLAGS) $(MCL_SLIB_LDFLAGS)
+	$(PRE)$(CXX) -o $@ $(LIB_OBJ) -shared $(CFLAGS) $(MCL_SLIB_CFLAGS)
 
 $(BN256_LIB): $(BN256_OBJ)
 	$(AR) $(ARFLAGS) $@ $(BN256_OBJ)
@@ -249,16 +249,16 @@ $(SHE384_256_LIB): $(SHE384_256_OBJ)
 	$(AR) $(ARFLAGS) $@ $(SHE384_256_OBJ)
 
 $(SHE256_SLIB): $(SHE256_OBJ) $(MCL_LIB)
-	$(PRE)$(CXX) -o $@ $(SHE256_OBJ) $(MCL_LIB) -shared $(LDFLAGS) $(SHE256_SLIB_LDFLAGS)
+	$(PRE)$(CXX) -o $@ $(SHE256_OBJ) $(MCL_LIB) -shared $(CFLAGS) $(SHE256_SLIB_CFLAGS)
 
 $(SHE384_SLIB): $(SHE384_OBJ) $(MCL_LIB)
-	$(PRE)$(CXX) -o $@ $(SHE384_OBJ) $(MCL_LIB) -shared $(LDFLAGS) $(SHE384_SLIB_LDFLAGS)
+	$(PRE)$(CXX) -o $@ $(SHE384_OBJ) $(MCL_LIB) -shared $(CFLAGS) $(SHE384_SLIB_CFLAGS)
 
 $(SHE384_256_SLIB): $(SHE384_256_OBJ) $(MCL_LIB)
-	$(PRE)$(CXX) -o $@ $(SHE384_256_OBJ) $(MCL_LIB) -shared $(LDFLAGS) $(SHE384_256_SLIB_LDFLAGS)
+	$(PRE)$(CXX) -o $@ $(SHE384_256_OBJ) $(MCL_LIB) -shared $(CFLAGS) $(SHE384_256_SLIB_CFLAGS)
 
 $(BN256_SLIB): $(BN256_OBJ) $(MCL_SLIB)
-	$(PRE)$(CXX) -o $@ $(BN256_OBJ) -shared $(LDFLAGS) $(BN256_SLIB_LDFLAGS)
+	$(PRE)$(CXX) -o $@ $(BN256_OBJ) -shared $(CFLAGS) $(BN256_SLIB_CFLAGS)
 
 $(BN384_LIB): $(BN384_OBJ)
 	$(AR) $(ARFLAGS) $@ $(BN384_OBJ)
@@ -270,13 +270,13 @@ $(BN512_LIB): $(BN512_OBJ)
 	$(AR) $(ARFLAGS) $@ $(BN512_OBJ)
 
 $(BN384_SLIB): $(BN384_OBJ) $(MCL_SLIB)
-	$(PRE)$(CXX) -o $@ $(BN384_OBJ) -shared $(LDFLAGS) $(BN384_SLIB_LDFLAGS)
+	$(PRE)$(CXX) -o $@ $(BN384_OBJ) -shared $(CFLAGS) $(BN384_SLIB_LDFLAGS)
 
 $(BN384_256_SLIB): $(BN384_256_OBJ) $(MCL_SLIB)
-	$(PRE)$(CXX) -o $@ $(BN384_256_OBJ) -shared $(LDFLAGS) $(BN384_256_SLIB_LDFLAGS)
+	$(PRE)$(CXX) -o $@ $(BN384_256_OBJ) -shared $(CFLAGS) $(BN384_256_SLIB_LDFLAGS)
 
 $(BN512_SLIB): $(BN512_OBJ) $(MCL_SLIB)
-	$(PRE)$(CXX) -o $@ $(BN512_OBJ) -shared $(LDFLAGS) $(BN512_SLIB_LDFLAGS)
+	$(PRE)$(CXX) -o $@ $(BN512_OBJ) -shared $(CFLAGS) $(BN512_SLIB_LDFLAGS)
 
 ECDSA_OBJ=$(OBJ_DIR)/ecdsa_c.o
 $(ECDSA_LIB): $(ECDSA_OBJ)

diff --git a/common.mk b/common.mk
@@ -132,6 +132,8 @@ ifeq ($(MCL_USE_GMP),1)
   GMP_LIB=-lgmp -lgmpxx
   ifeq ($(UNAME_S),Darwin)
     GMP_DIR?=/opt/homebrew/
+  endif
+  ifneq ($(GMP_DIR),)
     CFLAGS+=-I$(GMP_DIR)/include
     LDFLAGS+=-L$(GMP_DIR)/lib
   endif

diff --git a/readme.md b/readme.md
@@ -160,10 +160,14 @@ env MCL_PROF=2 bin/bls12_test.exe
 
 ## How to build on 32-bit x86 Linux
 
-Build GMP for 32-bit mode (`env ABI=32 ./configure --enable-cxx ...`) and install `<lib32>` at yourself.
+Build GMP for 32-bit mode.
 
 ```
-make ARCH=x86 CFLAGS_USER="-I <lib32>/include" LDFLAGS_USER="-L <lib32>/lib -Wl,-rpath,<lib32>/lib"
+cd <GMP dir>
+env ABI=32 ./configure --enable-cxx --prefix=<install dir>
+make -j install
+cd <mcl dir>
+make ARCH=x86 LLVM_VER=-12 GMP_DIR=<install dir>
 ```
 
 # How to build on 64-bit Windows with Visual Studio