History

libtcc1.a while "configure --enable-cross" build and install libtcc1.a for i386, x86_64 and arm64 (libtcc1.a for x86_64 was not installed on i386)

seyko committed 11 years ago

Commit cfaa1651 parent 3dba9cc2 files · +10 −7Browse files

Unified · Split

2 files
  1. Makefile +9 −6
  2. lib/Makefile +1 −1
Makefile+9−6
@@ -137,12 +137,14 @@ LIBTCC1=libtcc1.a · 136 unmodified lines
137else ifeq ($(ARCH),i386)137else ifeq ($(ARCH),i386)
138NATIVE_FILES=$(I386_FILES)138NATIVE_FILES=$(I386_FILES)
139PROGS_CROSS=$($(X64_CROSS)_LINK) $($(WIN32_CROSS)_LINK) $($(WIN64_CROSS)_LINK) $(ARM_CROSS) $(ARM64_CROSS) $(C67_CROSS) $(WINCE_CROSS)139PROGS_CROSS=$($(X64_CROSS)_LINK) $($(WIN32_CROSS)_LINK) $($(WIN64_CROSS)_LINK) $(ARM_CROSS) $(ARM64_CROSS) $(C67_CROSS) $(WINCE_CROSS)
140LIBTCC1_CROSS=lib/i386-win/libtcc1.a lib/x86_64-win/libtcc1.a lib/x86_64/libtcc1.a140LIBTCC1_CROSS=lib/i386-win/libtcc1.a lib/x86_64-win/libtcc1.a lib/i386/libtcc1.a lib/x86_64/libtcc1.a \
141 lib/arm64/libtcc1.a
141LIBTCC1=libtcc1.a142LIBTCC1=libtcc1.a
142else ifeq ($(ARCH),x86-64)143else ifeq ($(ARCH),x86-64)
143NATIVE_FILES=$(X86_64_FILES)144NATIVE_FILES=$(X86_64_FILES)
144PROGS_CROSS=$($(I386_CROSS)_LINK) $($(WIN32_CROSS)_LINK) $($(WIN64_CROSS)_LINK) $(ARM_CROSS) $(ARM64_CROSS) $(C67_CROSS) $(WINCE_CROSS)145PROGS_CROSS=$($(I386_CROSS)_LINK) $($(WIN32_CROSS)_LINK) $($(WIN64_CROSS)_LINK) $(ARM_CROSS) $(ARM64_CROSS) $(C67_CROSS) $(WINCE_CROSS)
145LIBTCC1_CROSS=lib/i386-win/libtcc1.a lib/x86_64-win/libtcc1.a lib/i386/libtcc1.a146LIBTCC1_CROSS=lib/i386-win/libtcc1.a lib/x86_64-win/libtcc1.a lib/i386/libtcc1.a lib/x86_64/libtcc1.a \
147 lib/arm64/libtcc1.a
146LIBTCC1=libtcc1.a148LIBTCC1=libtcc1.a
147else ifeq ($(ARCH),arm)149else ifeq ($(ARCH),arm)
148NATIVE_FILES=$(ARM_FILES)150NATIVE_FILES=$(ARM_FILES)
@@ -296,11 +298,12 @@ endif · 147 unmodified lines
296ifdef CONFIG_CROSS298ifdef CONFIG_CROSS
297 mkdir -p "$(tccdir)/win32/lib/32"299 mkdir -p "$(tccdir)/win32/lib/32"
298 mkdir -p "$(tccdir)/win32/lib/64"300 mkdir -p "$(tccdir)/win32/lib/64"
299ifneq ($(ARCH),i386)
300 mkdir -p "$(tccdir)/i386"301 mkdir -p "$(tccdir)/i386"
302 mkdir -p "$(tccdir)/x86_64"
303 mkdir -p "$(tccdir)/arm64"
304 $(INSTALL) -m644 lib/arm64/libtcc1.a "$(tccdir)/arm64"
301 $(INSTALL) -m644 lib/i386/libtcc1.a "$(tccdir)/i386"305 $(INSTALL) -m644 lib/i386/libtcc1.a "$(tccdir)/i386"
302 cp -r "$(tccdir)/include" "$(tccdir)/i386"306 $(INSTALL) -m644 lib/x86_64/libtcc1.a "$(tccdir)/x86_64"
303endif
304 $(INSTALL) -m644 $(top_srcdir)/win32/lib/*.def "$(tccdir)/win32/lib"307 $(INSTALL) -m644 $(top_srcdir)/win32/lib/*.def "$(tccdir)/win32/lib"
305 $(INSTALL) -m644 lib/i386-win/libtcc1.a "$(tccdir)/win32/lib/32"308 $(INSTALL) -m644 lib/i386-win/libtcc1.a "$(tccdir)/win32/lib/32"
306 $(INSTALL) -m644 lib/x86_64-win/libtcc1.a "$(tccdir)/win32/lib/64"309 $(INSTALL) -m644 lib/x86_64-win/libtcc1.a "$(tccdir)/win32/lib/64"
@@ -366,7 +369,7 @@ export LIBTCC1 · 59 unmodified lines
366clean:369clean:
367 rm -vf $(PROGS) tcc_p$(EXESUF) tcc.pod *~ *.o *.a *.so* *.out *.log \370 rm -vf $(PROGS) tcc_p$(EXESUF) tcc.pod *~ *.o *.a *.so* *.out *.log \
368 *.exe a.out tags TAGS libtcc_test$(EXESUF) tcc$(EXESUF)371 *.exe a.out tags TAGS libtcc_test$(EXESUF) tcc$(EXESUF)
369 -rm -r $(ARCH)372 -rm -r $(ARCH) arm64
370 -rm *-tcc$(EXESUF)373 -rm *-tcc$(EXESUF)
371 $(MAKE) -C tests $@374 $(MAKE) -C tests $@
372ifneq ($(LIBTCC1),)375ifneq ($(LIBTCC1),)
lib/Makefile+1−1
@@ -125,4 +125,4 @@ $(DIR)/exists : · 124 unmodified lines
125 @echo $@ > $@125 @echo $@ > $@
126 126
127clean :127clean :
128 rm -rfv i386-win x86_64-win i386 x86_64128 rm -rfv i386-win x86_64-win i386 x86_64 arm64

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t